azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix standalone compiler build

Browse Source
This commit is contained in:
Leonid Shalupov
2012-05-02 23:04:21 +04:00
parent 6dd5780cbd
commit 6626086abf
5 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/libraries/js_libs.xml
Generated
-1
View File
@@ -1,7 +1,6 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="js-libs"> <library name="js-libs">
<CLASSES> <CLASSES>
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/args4j-2.0.12.jar!/" />
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/json.jar!/" /> <root url="jar://$PROJECT_DIR$/js/js.translator/lib/json.jar!/" />
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/rhino-1.7R3.jar!/" /> <root url="jar://$PROJECT_DIR$/js/js.translator/lib/rhino-1.7R3.jar!/" />
<root url="jar://$PROJECT_DIR$/js/js.translator/lib/dart-r3300.jar!/" /> <root url="jar://$PROJECT_DIR$/js/js.translator/lib/dart-r3300.jar!/" />
build.xml
+43 -38
View File
@@ -197,6 +197,8 @@
<zap pattern="org.jdom.xpath.Jaxen*"/> <zap pattern="org.jdom.xpath.Jaxen*"/>
<zap pattern="org.mozilla.javascript.xml.impl.xmlbeans.**" />
<rule pattern="com.intellij.**" result="kotlinc.internal.com.intellij.@1"/> <rule pattern="com.intellij.**" result="kotlinc.internal.com.intellij.@1"/>
<rule pattern="com.sun.jna.**" result="kotlinc.internal.com.sun.jna.@1"/> <rule pattern="com.sun.jna.**" result="kotlinc.internal.com.sun.jna.@1"/>
<rule pattern="org.apache.log4j.**" result="kotlinc.internal.org.apache.log4j.@1"/> <rule pattern="org.apache.log4j.**" result="kotlinc.internal.org.apache.log4j.@1"/>
@@ -244,53 +246,56 @@
<available property="rtjar" value="${java.home}/lib/rt.jar" file="${java.home}/lib/rt.jar" /> <available property="rtjar" value="${java.home}/lib/rt.jar" file="${java.home}/lib/rt.jar" />
<available property="rtjar" value="${java.home}/../Classes/classes.jar" file="${java.home}/../Classes/classes.jar" /> <available property="rtjar" value="${java.home}/../Classes/classes.jar" file="${java.home}/../Classes/classes.jar" />
<delete file="${output}/kotlin-compiler.jar" failonerror="false"/> <delete file="${output}/kotlin-compiler.jar" failonerror="false"/>
<copy file="${output}/kotlin-compiler-clean.jar" tofile="${output}/kotlin-compiler.jar"/> <proguard><![CDATA[
<!--<proguard><![CDATA[--> -injars '${output}/kotlin-compiler-clean.jar'
<!---injars '${output}/kotlin-compiler-clean.jar'--> -outjars '${output}/kotlin-compiler.jar'
<!---outjars '${output}/kotlin-compiler.jar'-->
<!---libraryjars '${rtjar}'--> -libraryjars '${rtjar}'
<!---target 1.6--> -target 1.6
<!---dontoptimize--> -dontoptimize
<!---dontobfuscate--> -dontobfuscate
<!--# Keep application classes, along with their 'main' methods.--> # Keep application classes, along with their 'main' methods.
<!---keepclasseswithmembers public class * {--> -keepclasseswithmembers public class * {
<!--public static void main(java.lang.String[]);--> public static void main(java.lang.String[]);
<!--}--> }
<!---keepclasseswithmembers class * {--> -keepclasseswithmembers class * {
<!--# Various dynamically called methods--> # Various dynamically called methods
<!--void start();--> void start();
<!--void stop();--> void stop();
<!--void dispose();--> void dispose();
<!--** getFileSystem();--> ** getFileSystem();
<!--** isVarArgs();--> ** isVarArgs();
<!--** getApplication();--> ** getApplication();
<!--** executeOnPooledThread(java.lang.Runnable);--> ** finalizeReferent();
<!--int getBooleanAttributes(java.io.File);--> ** newBuilder();
<!--<init>(kotlinc.internal.com.intellij.lang.ASTNode);--> ** startFinalizer(java.lang.Class,java.lang.Object);
<!--}--> ** executeOnPooledThread(java.lang.Runnable);
** getUserData(java.lang.String);
int getBooleanAttributes(java.io.File);
<init>(kotlinc.internal.com.intellij.lang.ASTNode);
}
<!--# Keep the special static methods that are required in enumeration classes.--> # Keep the special static methods that are required in enumeration classes.
<!---keepclassmembers enum * {--> -keepclassmembers enum * {
<!--public static **[] values();--> public static **[] values();
<!--public static ** valueOf(java.lang.String);--> public static ** valueOf(java.lang.String);
<!--}--> }
<!---keepclassmembers class * {--> -keepclassmembers class * {
<!--** toString();--> ** toString();
<!--** hashCode();--> ** hashCode();
<!--** project();--> ** project();
<!--** TYPE;--> ** TYPE;
<!--** ourInstance;--> ** ourInstance;
<!--}--> }
<!--]]></proguard>--> ]]></proguard>
<delete file="${output}/kotlin-compiler-clean.jar" /> <delete file="${output}/kotlin-compiler-clean.jar" />
</target> </target>
js/js.translator/lib/args4j-2.0.12.jar
BIN
View File
Binary file not shown.
js/js.translator/lib/closure-compiler.jar
BIN
View File
Binary file not shown.
js/js.translator/lib/closure-compiler_mod.txt
+14 -1
View File
@@ -1 +1,14 @@
Deleted package com.google.javascript.jscomp.ant to avoid dependency on ant.jar. 1) Deleted package com.google.javascript.jscomp.ant to avoid dependency on ant.jar.
2) jarjar-ed it:
<target name="jarjarClosureCompiler">
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${basedir}/dependencies/jarjar.jar"/>
<delete file="${output}/closure-compiler.jar" failonerror="false"/>
<jarjar jarfile="${output}/closure-compiler.jar">
<zipgroupfileset dir="${basedir}" includes="closure-compiler.jar" />
<rule pattern="com.google.common.**" result="closurecompiler.internal.com.google.common.@1"/>
<rule pattern="com.google.protobuf.**" result="closurecompiler.internal.com.google.protobuf.@1"/>
<rule pattern="org.mozilla.classfile.**" result="closurecompiler.internal.org.mozilla.classfile.@1"/>
</jarjar>
</target>