@@ -39,7 +39,7 @@ <!-- import ivy's ant tasks --> <target name="install-ivy" depends="download-ivy"> <path id="ivy.lib.path"> - <fileset dir="${ivy.jar.dir}" includes="*.jar"/> + <fileset dir="${ivy.jar.dir}" includes="ivy-${ivy.install.version}.jar"/> </path> <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" /> </target> ant/bootstrap.xml @@ -17,6 +17,8 @@ skipemptyfilesets="true" verbose="true"> <arg value="--gen" /> <arg value="java" /> + <arg value="--gen" /> + <arg value="rb" /> <arg value="-o" /> <arg value="${target.dir}" /> <arg value="" /> @@ -59,13 +61,15 @@ <target name="compile-jni" depends="check-jni-source" if="build.jni.ok"> <ant dir="src/main/jni" target="compile" inheritAll="false" /> + </target> + + <target name="install-jni" depends="compile-jni" if="build.jni"> <copy todir="${dist.dir}" flatten="true"> <fileset dir="src/main/jni" includes="**/target/*.${os.jni.ext}" /> <fileset dir="src/main/jni" includes="**/target/*.jar" /> </copy> </target> - <!-- compile old-skool java --> <target name="compile-java" if="build.java"> @@ -92,7 +96,25 @@ <!-- create properties file with build info --> - <target name="write-build-info" depends="init" if="ivy.extra.buildpackage"> + <target name="find-git-revision" unless="no.git"> + <!-- ask git for the current "head" commit-id, for memoizing inside the built jar --> + <exec outputproperty="revision" executable="git-rev-parse" failifexecutionfails="false"> + <arg value="head" /> + </exec> + <exec executable="git-rev-parse" failifexecutionfails="false"> + <arg value="head" /> + <redirector outputproperty="revision-short"> + <outputfilterchain> + <tokenfilter> + <filetokenizer /> + <replaceregex pattern="(.{8}).*" replace="\1"/> + </tokenfilter> + </outputfilterchain> + </redirector> + </exec> + </target> + + <target name="write-build-info" depends="init, find-git-revision" if="ivy.extra.buildpackage"> <tstamp> <format property="build.timestamp" pattern="yyyyMMdd-HHmmss" /> </tstamp> @@ -104,6 +126,7 @@ <entry key="name" value="${ivy.module}" /> <entry key="version" value="${ivy.revision}" /> <entry key="build_name" value="${build.timestamp}" /> + <entry key="build_revision" value="${revision}" /> </propertyfile> </target> @@ -114,17 +137,10 @@ <copy todir="${dist.dir}/libs" flatten="true"> <path refid="deps.path" /> </copy> - <pathconvert refid="deps.path" pathsep=" " property="deps.path.jar-format"> - <chainedmapper> - <flattenmapper /> - <globmapper from="*" to="libs/*" /> - </chainedmapper> - </pathconvert> - - <copy todir="${target.dir}/test-classes/resources" failonerror="false"> + <copy todir="${target.dir}/test-classes/" failonerror="false"> <fileset dir="${test.source.dir}/resources" /> </copy> - <copy todir="${dist.dir}/resources" overwrite="true" failonerror="false"> + <copy todir="${target.dir}/classes/" overwrite="true" failonerror="false"> <fileset dir="${source.dir}/resources" /> </copy> </target> @@ -157,7 +173,7 @@ <target name="compile" depends="prepare, find-source, compile-thrift, check-jni-source, compile-jni, - compile-java, compile-scala, write-build-info, copy-extra" + install-jni, compile-java, compile-scala, write-build-info, copy-extra" description="compile java and scala code" /> </project> ant/compile.xml @@ -6,13 +6,17 @@ <pathconvert property="doc.sources" pathsep=" "> <fileset dir="${source.dir}" includes="**/*.scala" /> </pathconvert> + <path id="docs.path"> + <path refid="bootstrap.path" /> + <pathelement location="${target.dir}/classes" /> + </path> <echo message="Building vscaladoc..." /> <java classname="org.scala_tools.vscaladoc.Main" fork="true" failonerror="true"> <classpath> <path refid="bootstrap.path" /> </classpath> <arg value="-classpath" /> - <arg pathref="bootstrap.path" /> + <arg pathref="docs.path" /> <arg value="-d" /> <arg value="${docs.target.dir}/scaladoc" /> <arg value="-sourcepath" /> ant/docs.xml @@ -1,14 +1,32 @@ <project xmlns:ivy="antlib:org.apache.ivy.ant"> - <target name="make-non-executable-jar" unless="ivy.extra.jarclassname"> - <jar destfile="${dist.dir}/${ivy.module}-${ivy.revision}.jar"> + <!-- unzip all the dependent jars into target/ so that the final jar will depend on nothing. kinda evil. --> + <target name="pack-deps" if="pack.deps"> + <pathconvert pathsep="," property="deps.path.list"> + <path refid="deps.path" /> + <map from="/" to="" /> + </pathconvert> + <unzip dest="${target.dir}/classes"> + <fileset dir="/" includes="${deps.path.list}" /> + </unzip> + <delete dir="${target.dir}/classes/META-INF" /> + </target> + + <target name="make-non-executable-jar" unless="ivy.extra.jarclassname" depends="pack-deps"> + <jar destfile="${dist.dir}/${jar.name}.jar"> <fileset dir="${target.dir}/classes" /> </jar> </target> <!-- generate a jar that contains all deps inside it, so it can be run with "java -jar" --> - <target name="make-executable-jar" if="ivy.extra.jarclassname" depends="copy-extra"> - <jar destfile="${dist.dir}/${ivy.module}-${ivy.revision}.jar"> + <target name="make-executable-jar" if="ivy.extra.jarclassname" depends="copy-extra,pack-deps"> + <pathconvert refid="deps.path" pathsep=" " property="deps.path.jar-format"> + <chainedmapper> + <flattenmapper /> + <globmapper from="*" to="libs/*" /> + </chainedmapper> + </pathconvert> + <jar destfile="${dist.dir}/${jar.name}.jar"> <fileset dir="${target.dir}/classes" /> <manifest> <attribute name="Main-Class" value="${ivy.extra.jarclassname}" /> @@ -20,6 +38,13 @@ <target name="generate-scripts" depends="prepare" if="generate.scripts"> <pathconvert refid="deps.path" property="classpath" /> <pathconvert refid="test.path" property="test.classpath" /> + <pathconvert refid="deps.path" property="deps.path.dist-format"> + <chainedmapper> + <flattenmapper /> + <globmapper from="*" to="$${DIST_HOME}/libs/*" /> + </chainedmapper> + </pathconvert> + <!-- delete dir="${basedir}/target/scripts" /--> <mkdir dir="${dist.dir}/scripts" /> <copy todir="${dist.dir}/scripts" overwrite="true"> @@ -27,22 +52,30 @@ <filterset> <filter token="CLASSPATH" value="${classpath}:${target.dir}/classes" /> <filter token="TEST_CLASSPATH" value="${test.classpath}:${target.dir}/classes:${target.dir}/test-classes" /> + <filter token="DIST_CLASSPATH" value="${deps.path.dist-format}:$${DIST_HOME}/${jar.name}.jar" /> + <filter token="TARGET" value="${target.dir}" /> + <filter token="DIST_NAME" value="${dist.name}" /> </filterset> </copy> <chmod dir="${dist.dir}/scripts" includes="*" perm="ugo+x" /> </target> <target name="package" depends="test, make-non-executable-jar, make-executable-jar, - generate-scripts" description="build complete jar(s) and docs"> - <ivy:makepom ivyfile="${basedir}/ivy/ivy.xml" pomfile="${dist.dir}/${ivy.module}-${ivy.revision}.pom" /> + generate-scripts, docs" description="build complete jar(s) and docs"> + <ivy:makepom ivyfile="${basedir}/ivy/ivy.xml" pomfile="${dist.dir}/${dist.name}.pom" /> <ivy:deliver conf="*(public)" /> - <zip destfile="${basedir}/dist/${ivy.module}-${ivy.revision}.zip" + <condition property="dist.zip.name" value="namesearch-${revision-short}.zip"> + <isset property="dist_use_build_number" /> + </condition> + <property name="dist.zip.name" value="${dist.name}.zip" /> + <zip destfile="${basedir}/dist/${dist.zip.name}" basedir="${basedir}/dist"> - <include name="${ivy.module}-${ivy.revision}/${ivy.module}-${ivy.revision}.jar" /> - <include name="${ivy.module}-${ivy.revision}/*.so" /> - <include name="${ivy.module}-${ivy.revision}/*.jnilib" /> - <include name="${ivy.module}-${ivy.revision}/libs/**" /> - <include name="${ivy.module}-${ivy.revision}/config/**" /> + <include name="${dist.name}/${jar.name}.jar" /> + <include name="${dist.name}/*.so" /> + <include name="${dist.name}/*.jnilib" /> + <include name="${dist.name}/libs/**" /> + <include name="${dist.name}/config/**" /> + <include name="${dist.name}/scripts/**" /> </zip> <ivy:publish resolver="local" overwrite="true"> <artifacts pattern="${dist.dir}/[artifact]-[revision].[ext]" /> ant/package.xml @@ -7,12 +7,16 @@ <property name="ivy.deliver.ivy.pattern" value="${dist.dir}/[artifact]-[revision].[ext]" /> <ivy:info file="${ivy.dep.file}" /> - <property name="dist.dir" value="${basedir}/dist/${ivy.module}-${ivy.revision}" /> + + <property name="jar.name" value="${ivy.module}-${ivy.revision}" /> + <property name="dist.name" value="${ivy.module}-${ivy.revision}" /> + <property name="dist.relative.dir" value="dist/${dist.name}" /> + <property name="dist.dir" value="${basedir}/${dist.relative.dir}" /> <property name="docs.target.dir" value="${dist.dir}/docs" /> </target> <target name="resolve" depends="init"> - <ivy:retrieve conf="bootstrap,default,test" pattern="${target.dir}/libs/[conf]/[artifact]-[revision].[ext]" /> + <ivy:retrieve log="download-only" conf="bootstrap,default,test" pattern="${target.dir}/libs/[conf]/[artifact]-[revision].[ext]" /> <ivy:cachepath pathid="bootstrap.path" conf="bootstrap" /> <ivy:cachepath pathid="deps.path" conf="default" /> <ivy:cachepath pathid="test.path" conf="test" /> ant/prepare.xml bb2a0b685473f3e2749b42c078b3f32564768689 Robey Pointer robey@twitter.com http://github.com/robey/smile/commit/6965f4cb944fbafeaaf6e8342cceb12bf6dec0a6 6965f4cb944fbafeaaf6e8342cceb12bf6dec0a6 2009-01-08T23:57:30-08:00 2009-01-08T23:57:30-08:00 update scala-build. 8c81aab1df882542c276585dcc9a307a796e083a Robey Pointer robey@twitter.com