Christian
33ff87d8d9
Fix build script
2012-12-17 17:56:00 -05:00
Christian
af06bbd373
more 1.4.6 tweaks
2012-12-17 17:00:54 -05:00
Christian
a513060a81
Change to download bouncy castle as well. We also finally properly use the downloaded libs
...
even in vanilla code!
2012-12-11 22:37:07 -05:00
LexManos
a20958fb56
Updated build script to not use the mcp common directory as it doesn't exist anymore.
2012-12-08 21:41:51 -08:00
LexManos
221493453f
Remerged branch, and updated dev eclipse workspace.
2012-12-08 17:08:51 -08:00
Christian
66ff95f9d7
Fix build eclipse extractor task
2012-12-08 16:46:46 -08:00
Christian
9c77d3f25b
Remove old eclipse workspace and ship/extract as a zip file (use ant setupenvironment)
...
Fix up install.py for forge multibranch changes
2012-12-03 19:55:37 -05:00
Christian
516954e6f9
Name both zips the same format
2012-12-03 08:38:20 -05:00
Christian
39a146f8e6
Clean up build.xml script- support outputting a branched jar file
2012-12-03 08:13:20 -05:00
LexManos
8b2665980d
FML will now attempt to download MCP as part of the install process
...
Now shipping a py2exe version of python for windows.
Linux/Macs should come with python pre-installed so they do not have a distrabution here.
2012-12-02 19:59:22 -08:00
LexManos
d9d0a46809
Cleaned up some tabs
2012-11-19 15:00:11 -08:00
LexManos
c6a0741379
FML setup should now download and verify all the minecraft files needed to run MCP.
2012-11-08 17:54:05 -08:00
Christian
09eade4623
Update build - include MCP information in the source pack
2012-10-25 10:00:34 -04:00
Christian
9bfe7df373
MCP deserves lots of credit. So here it is.
2012-10-25 09:02:49 -04:00
Christian
989ab3e96b
Update build.xml - add a classpath to the manifest. This means the universal jar is now a server side launcher.
2012-10-18 21:07:33 -04:00
Christian
b5363e3552
Update build to not bother building client jar. Universal is everything
...
now.
2012-08-22 11:12:26 -04:00
LexManos
51b801b1c6
Force a Jenkins build
2012-08-14 01:21:56 -07:00
Christian
81c858c719
Hopefully let build continue if server reobf fails, and fix derp in FMLNetworkHandler for entities
2012-08-13 23:25:08 -04:00
Christian
25256b2295
Merge the last bits of the server code into the common directory, and annotate ModLoader/BaseMod for sided use
...
This means the FML-Server project is now defunct as all code is either common, client or bukkit.
2012-08-13 22:51:53 -04:00
Christian
e6d6932e21
Fix build script- put client in first
2012-08-11 13:05:37 -04:00
Christian
13756aad9f
Fix universal not to dupe entries in the jar, also add in the fml mod as "untransformable"
2012-08-11 12:34:25 -04:00
LexManos
7d479bf854
Added -no_gen_conf to jenkins build
2012-08-10 20:09:47 -07:00
LexManos
0f2d00abf3
Include conf folder and merge config in source zip
2012-08-08 23:44:32 -07:00
Christian
85b77c3d12
Generate a universal binary package since we can now :)
2012-08-09 01:57:42 -04:00
LexManos
0002bd2875
Fix packaging and install to not have the src/ folder, making it align better with the dev env.
2012-08-03 17:32:23 -07:00
LexManos
34971ff3e0
Fixed ant script to support common folder building and add the new files to the dist archives.
2012-08-03 03:37:45 -07:00
Christian
e06e9393c1
More build fixes for jenkins
2012-08-02 10:33:29 -02:30
Christian
4bb9fd7226
Try and fix the jenkins build
2012-08-02 10:30:52 -02:30
LexManos
c0a781c0bd
Introduced patching of runtime/commands.py to allow for usage of the src/common folder.
2012-08-02 00:51:51 -07:00
LexManos
b786d8909a
Rewrote patch generation and application to no longer need diff, and attempt to apply common patches on decompiles that don't have one side or the other.
2012-08-01 06:54:57 -07:00
LexManos
fcbe56b504
Modified the decompiler stage to:
...
Compile and run AccessTransformer during the pre-RG stage of decompilation.
Merge resulting sources that are identical to src/common
ToDo:
Finish the common intergration:
-update_patches - Add common folder support
-apply_patches:
--patch each side, also patch all common patches to each side incase they are not merged, only if file exists.
2012-08-01 03:25:45 -07:00
Christian
039d9252c6
Merge branch 'minecraft1.3' into newfmlmod
2012-07-23 23:02:25 -02:30
Christian
276fccb170
Check in new fml mod work so far. Lots still to do.
2012-07-14 13:58:46 -04:00
LexManos
25def1ceaf
Added call to clean_source to build script to fix patch fuzz on windows.
2012-07-12 18:06:39 -07:00
Christian
95194f1c5b
Add a "checkpatches" target and check if your patches are up to date before running a repatch operation
2012-07-06 09:19:58 -04:00
Christian
8ed36f583d
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
Christian
dfc6f7b1c1
Tweak build xml for more cleanliness
2012-07-03 08:14:35 -04:00
Christian
982271e8ec
Update some stuff
2012-07-02 23:49:40 -04:00
Christian
802ec3d86a
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 23:49:06 -04:00
Christian
f1b0e33694
Add in more options for ant script and clean up needing to clean every time.
2012-07-02 23:43:29 -04:00
Christian
086f575a41
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 15:56:33 -04:00
Christian
d491502750
Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of
...
setup and added an updatepatches call too
2012-07-02 15:54:25 -04:00
Christian
1d4c33d161
Merge branch 'antscriptupdates' into minecraft1.3
...
Conflicts:
build.xml
2012-07-02 15:21:15 -04:00
Christian
b59184424b
Add in a setupenvironment ant target specifically for setting up an FML environment from scratch
2012-07-02 15:16:40 -04:00
Christian
a7803d1785
Harvest MC version from MCP
2012-07-02 13:31:45 -04:00
Christian
a33f2dde77
Harvest MC version from MCP
2012-07-02 12:24:37 -04:00
Christian
dd128c8502
Revert "Revert "Fail the build when recompilation fails""
...
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
Christian
3812dc4464
Revert "Fail the build when recompilation fails"
...
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
Christian
146ee9b3c7
Fail the build when recompilation fails
2012-06-20 08:35:14 -04:00
Christian Weeks
9ad4177bfa
Bukkitside fixup
2012-06-01 00:27:46 -04:00
Christian