diff options
| author | Sven Gothel <[email protected]> | 2011-05-16 03:25:36 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-05-16 03:25:36 +0200 |
| commit | 6e6dd7228415e788ac254364c5f36a7d70216e6b (patch) | |
| tree | 31ea4ebe0521161c69e4f744957b8c8eb514c345 | |
| parent | c5a56e10677e9dc0a048c2be3de16701aac9ad17 (diff) | |
build: Query git branch/sha1 and use it if not set and tools are available; Add Java source zip file.
Query git branch/sha1 and use it if not set and tools are available.
This shall improve tracking of manual generated binaries/bundles.
Add Java source zip file. Contains all Java source code (incl. generated ones) enhancing
IDE usage, where API doc and source browsing of libs is supported (NB/Eclipse/etc).
| -rw-r--r-- | make/build.xml | 22 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.linux-x86_64.sh | 2 |
2 files changed, 20 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml index 78f7cdc..f058512 100644 --- a/make/build.xml +++ b/make/build.xml @@ -62,11 +62,23 @@ <format property="version.timestamp" pattern="yyyyMMdd"/> </tstamp> - <property file="${build}/artifact.properties"/> <property name="gluegen.build.number" value="manual"/> <property name="gluegen.build.id" value="${version.timestamp}"/> - <property name="gluegen.build.branch" value="master"/> - <property name="gluegen.build.commit" value="manual"/> + <mkdir dir="${build}" /> + <exec dir="." executable="git" logError="true" failonerror="false" failifexecutionfails="false" + output="${build}/localbranch.raw"> + <arg line="branch --no-color"/> + </exec> + <exec dir="." executable="sed" logError="true" failonerror="false" failifexecutionfails="false" + outputproperty="gluegen.build.branch"> + <arg line="-e '/^[^*]/d' -e 's/* \(.*\)/\1/' ${build}/localbranch.raw"/> + </exec> + <property name="gluegen.build.branch" value="manual"/> <!-- fallback --> + <exec dir="${project.root}" executable="git" logError="true" failonerror="false" failifexecutionfails="false" + outputproperty="gluegen.build.commit"> + <arg line="rev-parse HEAD"/> + </exec> + <property name="gluegen.build.commit" value="manual"/> <!-- fallback --> <!-- This is the version of GlueGen you are building --> <property name="gluegen_base_version" value="2.0"/> @@ -710,6 +722,10 @@ <copy todir="${archive}/jnlp-files"> <fileset dir="${project.root}/jnlp-files" includes="*" /> </copy> + <zip destfile="${archive}/gluegen-java-src.zip"> + <fileset dir="${src.java}"/> + <fileset dir="${build}/gensrc/java"/> + </zip> <archive.7z destfile="${build}/${archive.name}.7z" basedir="${build}" includes="${archive.name}/**" /> diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh index 408db63..33aae19 100755 --- a/make/scripts/make.gluegen.all.linux-x86_64.sh +++ b/make/scripts/make.gluegen.all.linux-x86_64.sh @@ -11,7 +11,7 @@ fi # -DisLinuxAMD64=true \ # -DisX11=true \ +# BUILD_ARCHIVE=true \ ant \ - -Djavacdebuglevel="source,lines,vars" \ -Drootrel.build=build-x86_64 \ $* 2>&1 | tee make.gluegen.all.linux-x86_64.log |