1.1 --- a/libs.clank/build.xml Mon May 18 19:33:34 2015 +0300
1.2 +++ b/libs.clank/build.xml Tue May 19 16:02:03 2015 +0300
1.3 @@ -46,14 +46,15 @@
1.4 <project name="libs.clank" default="netbeans" basedir=".">
1.5 <import file="../nbbuild/templates/projectized.xml"/>
1.6 <!--load env variables-->
1.7 - <property environment="env"/>
1.8 - <property name="env.SPUTNIK" value=""/>
1.9 -
1.10 - <property name="clank.suite.dir" value="${env.SPUTNIK}/clank.suite"/>
1.11 - <property name="clank.suite.jars.dir" value="${clank.suite.dir}/build/cluster/modules"/>
1.12 - <property name="clank.dest.dir" value="${basedir}/external"/>
1.13 -
1.14 - <target name="-check-clank-paths">
1.15 +
1.16 + <target name="-check-clank-paths" if="copy.clank.jars">
1.17 +
1.18 + <property environment="env"/>
1.19 + <property name="env.SPUTNIK" value=""/>
1.20 +
1.21 + <property name="clank.suite.dir" value="${env.SPUTNIK}/clank.suite"/>
1.22 + <property name="clank.suite.jars.dir" value="${clank.suite.dir}/build/cluster/modules"/>
1.23 +
1.24 <condition property="SPUTNIK.found">
1.25 <not>
1.26 <equals arg1="${env.SPUTNIK}" arg2=""/>
1.27 @@ -71,10 +72,19 @@
1.28 <fail unless="clank.suite.contains-files" message="${clank.suite.jars.dir} doesn't contain jar files. ${clank.suite.dir} was not built?"/>
1.29 </target>
1.30
1.31 - <target name="jar-prep" depends="-check-clank-paths,projectized-common.jar-prep">
1.32 - <echo message="copy ${clank.suite.jars.dir}/*.jar into ${clank.dest.dir}" />
1.33 - <copy todir="${clank.dest.dir}" overwrite="true">
1.34 - <fileset refid="clank.jars.fileset"/>
1.35 - </copy>
1.36 + <target name="jar-prep" depends="-check-clank-paths,projectized-common.jar-prep" if="copy.clank.jars">
1.37 + <property name="clank.dest.zip" value="${basedir}/external/clank_0.3.6.zip"/>
1.38 + <echo message="Zipping .jar files from ${clank.suite.jars.dir}/*.jar into ${clank.dest.zip}" />
1.39 + <zip basedir="${clank.suite.jars.dir}" destfile="${clank.dest.zip}">
1.40 + <fileset dir="${clank.suite.jars.dir}" includes="*.jar"/>
1.41 + </zip>
1.42 + </target>
1.43 +
1.44 + <target name="netbeans" depends="projectized-common.netbeans" if="copy.clank.jars">
1.45 + <!-- The only purpose of this target is to print warning below in the very end, rather than in the middle -->
1.46 + <echo level="warning" message="################################################################################"></echo>
1.47 + <echo level="warning" message="# Attention: clank was not downloaded, but copied from here:"></echo>
1.48 + <echo level="warning" message="# ${clank.suite.jars.dir}"></echo>
1.49 + <echo level="warning" message="################################################################################"></echo>
1.50 </target>
1.51 </project>
2.1 --- a/libs.clank/external/binaries-list Mon May 18 19:33:34 2015 +0300
2.2 +++ b/libs.clank/external/binaries-list Tue May 19 16:02:03 2015 +0300
2.3 @@ -1,4 +1,1 @@
2.4 -#036FA0032B44AD06A1F13504D97B3685B1C88961 jsch.agentproxy.core-0.0.7.jar
2.5 -#9F31964104D71855DF6B73F0C761CDEB3FA3C49C jsch.agentproxy.sshagent-0.0.7.jar
2.6 -#3FA59A536F3DC2197826DC7F224C0823C1534203 jsch.agentproxy.pageant-0.0.7.jar
2.7 -#F759114E5A9F9AE907EADB59DBF65189AA399B45 jsch.agentproxy.usocket-jna-0.0.7.jar
2.8 +EC77824EEFEA61B2F26E39831A02D90A0D5A8DDF clank_0.3.6.zip
2.9 \ No newline at end of file
3.1 --- a/libs.clank/nbproject/project.properties Mon May 18 19:33:34 2015 +0300
3.2 +++ b/libs.clank/nbproject/project.properties Tue May 19 16:02:03 2015 +0300
3.3 @@ -84,27 +84,26 @@
3.4 javadoc.reference.org-llvm-bitcode.jar=${sputnik}/modules/org.llvm.bitcode/src
3.5 javadoc.reference.org-llvm-option.jar=${sputnik}/modules/org.llvm.option/src
3.6 javadoc.reference.org-llvm-utils.jar=${sputnik}/modules/org.llvm.utils/src
3.7 -release.external/org-clang-arcmigrate.jar=modules/ext/org-clang-arcmigrate.jar
3.8 -release.external/org-clang-ast.jar=modules/ext/org-clang-ast.jar
3.9 -release.external/org-clang-basic.jar=modules/ext/org-clang-basic.jar
3.10 -release.external/org-clang-codegen.jar=modules/ext/org-clang-codegen.jar
3.11 -release.external/org-clang-driver.jar=modules/ext/org-clang-driver.jar
3.12 -release.external/org-clang-frontend.jar=modules/ext/org-clang-frontend.jar
3.13 -release.external/org-clang-frontendtool.jar=modules/ext/org-clang-frontendtool.jar
3.14 -release.external/org-clang-lex.jar=modules/ext/org-clang-lex.jar
3.15 -release.external/org-clang-parse.jar=modules/ext/org-clang-parse.jar
3.16 -release.external/org-clang-rewrite.jar=modules/ext/org-clang-rewrite.jar
3.17 -release.external/org-clang-sema.jar=modules/ext/org-clang-sema.jar
3.18 -release.external/org-clang-serialization.jar=modules/ext/org-clang-serialization.jar
3.19 -release.external/org-clang-staticanalyzer.jar=modules/ext/org-clang-staticanalyzer.jar
3.20 -release.external/org-clang-tools-driver.jar=modules/ext/org-clang-tools-driver.jar
3.21 -release.external/org-clang-tools-services.jar=modules/ext/org-clang-tools-services.jar
3.22 -release.external/org-clank-java.jar=modules/ext/org-clank-java.jar
3.23 -release.external/org-llvm-adtsupport.jar=modules/ext/org-llvm-adtsupport.jar
3.24 -release.external/org-llvm-bitcode.jar=modules/ext/org-llvm-bitcode.jar
3.25 -release.external/org-llvm-option.jar=modules/ext/org-llvm-option.jar
3.26 -release.external/org-llvm-utils.jar=modules/ext/org-llvm-utils.jar
3.27 -
3.28 +release.external/clank_0.3.6.zip!/org-clang-arcmigrate.jar=modules/ext/org-clang-arcmigrate.jar
3.29 +release.external/clank_0.3.6.zip!/org-clang-ast.jar=modules/ext/org-clang-ast.jar
3.30 +release.external/clank_0.3.6.zip!/org-clang-basic.jar=modules/ext/org-clang-basic.jar
3.31 +release.external/clank_0.3.6.zip!/org-clang-codegen.jar=modules/ext/org-clang-codegen.jar
3.32 +release.external/clank_0.3.6.zip!/org-clang-driver.jar=modules/ext/org-clang-driver.jar
3.33 +release.external/clank_0.3.6.zip!/org-clang-frontend.jar=modules/ext/org-clang-frontend.jar
3.34 +release.external/clank_0.3.6.zip!/org-clang-frontendtool.jar=modules/ext/org-clang-frontendtool.jar
3.35 +release.external/clank_0.3.6.zip!/org-clang-lex.jar=modules/ext/org-clang-lex.jar
3.36 +release.external/clank_0.3.6.zip!/org-clang-parse.jar=modules/ext/org-clang-parse.jar
3.37 +release.external/clank_0.3.6.zip!/org-clang-rewrite.jar=modules/ext/org-clang-rewrite.jar
3.38 +release.external/clank_0.3.6.zip!/org-clang-sema.jar=modules/ext/org-clang-sema.jar
3.39 +release.external/clank_0.3.6.zip!/org-clang-serialization.jar=modules/ext/org-clang-serialization.jar
3.40 +release.external/clank_0.3.6.zip!/org-clang-staticanalyzer.jar=modules/ext/org-clang-staticanalyzer.jar
3.41 +release.external/clank_0.3.6.zip!/org-clang-tools-driver.jar=modules/ext/org-clang-tools-driver.jar
3.42 +release.external/clank_0.3.6.zip!/org-clang-tools-services.jar=modules/ext/org-clang-tools-services.jar
3.43 +release.external/clank_0.3.6.zip!/org-clank-java.jar=modules/ext/org-clank-java.jar
3.44 +release.external/clank_0.3.6.zip!/org-llvm-adtsupport.jar=modules/ext/org-llvm-adtsupport.jar
3.45 +release.external/clank_0.3.6.zip!/org-llvm-bitcode.jar=modules/ext/org-llvm-bitcode.jar
3.46 +release.external/clank_0.3.6.zip!/org-llvm-option.jar=modules/ext/org-llvm-option.jar
3.47 +release.external/clank_0.3.6.zip!/org-llvm-utils.jar=modules/ext/org-llvm-utils.jar
3.48 sigtest.gen.fail.on.error=false
3.49
3.50 source.reference.org-clang-arcmigrate.jar=${sputnik}/modules/org.clang.arcmigrate/src
3.51 @@ -127,3 +126,6 @@
3.52 source.reference.org-llvm-bitcode.jar=${sputnik}/modules/org.llvm.bitcode/src
3.53 source.reference.org-llvm-option.jar=${sputnik}/modules/org.llvm.option/src
3.54 source.reference.org-llvm-utils.jar=${sputnik}/modules/org.llvm.utils/src
3.55 +
3.56 +#set copy.clank.jars property to copy clank jars from ${SPUTNIK} instead of downloading
3.57 +#copy.clank.jars=true