Commit Graph

47 Commits

Author SHA1 Message Date
Christian b51c357d50 More build fixes for jenkins 2012-08-02 10:33:29 -02:30
Christian e44515304a Try and fix the jenkins build 2012-08-02 10:30:52 -02:30
LexManos 1e47f3e468 Introduced patching of runtime/commands.py to allow for usage of the src/common folder. 2012-08-02 00:51:51 -07:00
LexManos 4fb08f1660 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 4ca63717e5 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 50ed44359d Merge branch 'minecraft1.3' into newfmlmod 2012-07-23 23:02:25 -02:30
Christian 3115f92ee4 Check in new fml mod work so far. Lots still to do. 2012-07-14 13:58:46 -04:00
LexManos 0a9ee584bf Added call to clean_source to build script to fix patch fuzz on windows. 2012-07-12 18:06:39 -07:00
Christian 59949849f0 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 e8b09f4692 Got the relauncher downloading and injecting library files 2012-07-05 15:23:37 -04:00
Christian 60b50bb7f2 Tweak build xml for more cleanliness 2012-07-03 08:14:35 -04:00
Christian 07a1927c25 Update some stuff 2012-07-02 23:49:40 -04:00
Christian 777b4407c2 Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 23:49:06 -04:00
Christian a98ffafd71 Add in more options for ant script and clean up needing to clean every time. 2012-07-02 23:43:29 -04:00
Christian f0aa28162e Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 15:56:33 -04:00
Christian 2090264599 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 ecaa158981 Merge branch 'antscriptupdates' into minecraft1.3
Conflicts:
	build.xml
2012-07-02 15:21:15 -04:00
Christian 6c99b80b73 Add in a setupenvironment ant target specifically for setting up an FML environment from scratch 2012-07-02 15:16:40 -04:00
Christian 0418f01886 Harvest MC version from MCP 2012-07-02 13:31:45 -04:00
Christian a8f599983e Harvest MC version from MCP 2012-07-02 12:24:37 -04:00
Christian 63be4cb88f Revert "Revert "Fail the build when recompilation fails""
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
Christian acbc8d9a1b Revert "Fail the build when recompilation fails"
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
Christian 198dd807fd Fail the build when recompilation fails 2012-06-20 08:35:14 -04:00
Christian Weeks 4085617ca2 Bukkitside fixup 2012-06-01 00:27:46 -04:00
Christian Weeks 7b5ad64378 Update git version capture 2012-05-10 13:01:39 -04:00
Christian Weeks 89a6790222 Update build to actually put Loader in... 2012-05-10 11:16:58 -04:00
Christian Weeks 4c9ca1ffc1 tweak location of build properties in src jar 2012-05-10 10:09:56 -04:00
Christian Weeks 5a93998097 Lots of tweaks to mod output pretty printing. new versioning scheme. 2012-05-10 09:42:31 -04:00
Christian Weeks 311ca8866e Fix up build script a bit, all modloader is public, and fix tile entity renderer 2012-05-10 00:07:46 -04:00
Christian Weeks e0e77a6bb5 API is restored for client side. Implementation starting. 2012-05-05 14:42:46 -04:00
Christian Weeks 12a928536a Fix a small issue with the build output script
Fix a significant issue with MLProp handling and primitives- they work now
2012-04-26 17:38:31 -04:00
Christian Weeks 55fe1aa1e3 Build should work now. Fix a stupid javadoc import. 2012-04-05 21:44:06 -04:00
Christian Weeks 09d37f87b0 New build script- version the src dist as well 2012-04-05 21:40:16 -04:00
Christian Weeks 4470a808b1 Fix INSTALL-fml.txt file location in the server zip 2012-04-05 10:37:05 -04:00
LexManos 3a5c176af4 Cleaned up update_patches to fix a few bugs. Updated applypatches to normalize the patch file's line endings to make them work cross platform. Added download_firnflower and setup script. As well as added the GnuWin32's diff binary, so windows can create patches as well. http://gnuwin32.sourceforge.net/ 2012-04-05 00:09:29 -07:00
Christian Weeks 11c3817779 Tweak the build a bit, add some more data and generate the
touched file list for forge
2012-04-04 11:05:31 -04:00
Christian Weeks 371d69f89c Tidy up some of the installation media 2012-04-04 09:48:36 -04:00
Christian Weeks 9e404a48c5 Fix build script for generating md5s 2012-04-02 18:12:49 -04:00
Christian Weeks 63dbdd8db3 Update to 1.2.5 and hopefully forge compatibility 2012-04-02 18:09:06 -04:00
Christian Weeks ebf945f2bd Fix NPE 2012-03-31 01:04:29 -04:00
Christian Weeks cec16187c1 some build and logging tweaks 2012-03-30 21:21:43 -04:00
Christian Weeks f075e613e3 Fix build 2012-03-30 21:10:43 -04:00
Christian Weeks e5b4d1e953 More build stuff 2012-03-30 20:38:31 -04:00
Christian Weeks 18069778d9 More building fun 2012-03-30 17:36:50 -04:00
Christian Weeks ba46c2e3bc fix build script 2012-03-30 17:00:49 -04:00
Christian Weeks 620764f315 More build stuff, adding in readme etc copied from forge 2012-03-30 16:40:54 -04:00
Christian Weeks c7437f3a3b Build system 2012-03-30 16:22:10 -04:00