keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merged transformers/ to /common and renamed the asm source download to align better with the asm bin file name.

This commit is contained in:
LexManos 2012-08-03 23:51:49 -07:00
parent fbc968e1b4
commit fc8c2ac6e4
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java → fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java
View File

2
fml/eclipse/FML-Client/.classpath
View File

@ -23,7 +23,7 @@
</classpathentry>
<classpathentry exported="true" kind="lib" path="jars/bin/minecraft.jar"/>
<classpathentry exported="true" kind="lib" path="lib/argo-2.25.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
fml/eclipse/FML-Server/.classpath
View File

@ -7,7 +7,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="jars/minecraft_server.jar"/>
<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
<classpathentry kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
fml/eclipse/MCP-Client/.classpath
View File

@ -19,7 +19,7 @@
</classpathentry>
<classpathentry exported="true" kind="lib" path="jars/bin/minecraft.jar"/>
<classpathentry exported="true" kind="lib" path="lib/argo-2.25.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
fml/install/eclipse/Client/.classpath
View File

@ -20,7 +20,7 @@
</classpathentry>
<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>
<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
<classpathentry exported="true" kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
<classpathentry exported="true" kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
fml/install/eclipse/Server/.classpath
View File

@ -5,7 +5,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="lib" path="jars/minecraft_server.jar"/>
<classpathentry kind="lib" path="lib/argo-2.25.jar"/>
<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-4.0-source.zip"/>
<classpathentry kind="lib" path="lib/asm-all-4.0.jar" sourcepath="lib/asm-all-4.0-source.jar"/>
<classpathentry kind="lib" path="lib/guava-12.0.1.jar" sourcepath="lib/guava-12.0.1-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

4
fml/install/fml.py
View File

@ -29,7 +29,7 @@ def download_deps(mcp_path):
print "Downloading Fernflower failed download manually from http://goo.gl/PnJHp"
ret = False
for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'guava-12.0.1-sources.jar', 'asm-all-4.0.jar', 'asm-4.0-source.zip']:
for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'guava-12.0.1-sources.jar', 'asm-all-4.0.jar', 'asm-all-4.0-source.jar']:
libF = os.path.join(mcp_path, 'lib')
if not os.path.isdir(libF):
os.makedirs(libF)
@ -158,7 +158,7 @@ def setup_fml(fml_dir, mcp_dir):
#Compile AccessTransformer
forkcmd = ('%s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {target}' % self.cmdjavac).format(
classpath=os.pathsep.join(['.', os.path.join(mcp_dir, 'lib', '*')]), sourcepath=os.path.join(fml_dir, 'common'), outpath=os.path.join(fml_dir, 'bin'),
target=os.path.join(fml_dir, 'transformers', 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers', 'AccessTransformer.java'))
target=os.path.join(fml_dir, 'common', 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers', 'AccessTransformer.java'))
#print forkcmd
self.runcmd(forkcmd)