Skip to content
Browse files

[ignore] Replacing use of subversion properties and svnkit libraries.

  • Loading branch information...
1 parent 065b970 commit 77f91411b0320f455db4c903c46a32180e428659 @ljo ljo committed
Showing with 31 additions and 163 deletions.
  1. +1 −1 build.bat
  2. +1 −1 build.sh
  3. +1 −3 build.xml
  4. +12 −12 build/scripts/build-impl.xml
  5. +4 −8 build/scripts/dist.xml
  6. +12 −13 build/scripts/installer.xml
  7. +0 −125 build/scripts/subversion.xml
View
2 build.bat
@@ -21,7 +21,7 @@ set EXIST_HOME=%CD%
:gotExistHome
set ANT_HOME=%EXIST_HOME%\tools\ant
-set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher.jar;%EXIST_HOME%\lib\user\svnkit.jar;%EXIST_HOME%\lib\user\svnkit-cli.jar
+set _LIBJARS=%CLASSPATH%;%ANT_HOME%\lib\ant-launcher.jar
set JAVA_ENDORSED_DIRS=%EXIST_HOME%\lib\endorsed
View
2 build.sh
@@ -30,7 +30,7 @@ fi
ANT_HOME="$EXIST_HOME/tools/ant"
-LOCALCLASSPATH="$ANT_HOME/lib/ant-launcher.jar:$EXIST_HOME/lib/user/svnkit.jar:$EXIST_HOME/lib/user/svnkit-cli.jar"
+LOCALCLASSPATH="$ANT_HOME/lib/ant-launcher.jar"
JAVA_ENDORSED_DIRS="$EXIST_HOME"/lib/endorsed
View
4 build.xml
@@ -2,7 +2,7 @@
<!-- ======================================================================= -->
<!-- eXist 2.x build file -->
<!-- ======================================================================= -->
-<!-- $Id$ -->
+
<project basedir="." default="all" name="eXist-DB">
<description>eXist Open Source Native XML Database</description>
@@ -32,6 +32,4 @@
<import file="build/scripts/performance.xml"/>
<import file="build/scripts/quality.xml"/>
<import file="build/scripts/static-docs.xml"/>
- <import file="build/scripts/subversion.xml"/>
-
</project>
View
24 build/scripts/build-impl.xml
@@ -4,8 +4,6 @@
<!-- eXist build file -->
<!-- ======================================================================= -->
-<!-- $Id$ -->
-
<project basedir="../.." default="all" name="exist">
<!-- setup properties -->
@@ -40,9 +38,11 @@
<property name="xmldb.src" value="undefined"/>
<property name="dist.dir" value="${dist}/${project.name}-${project.version}"/>
+ <condition property="git.commit" value="${git.commit}" else="">
+ <isset property="git.commit" />
+ </condition>
<!-- import common targets -->
<!-- <import file="../../build.xml"/> -->
- <import file="./subversion.xml"/>
<import file="./junit.xml"/>
<import file="./antlr3.xml"/>
@@ -52,7 +52,7 @@
<!-- additional set of ant tasks -->
<property name="asocat-exist.jar" location="${tools.ant}/lib/asocat-exist.jar"/>
-
+
<!-- setup class path -->
<path id="classpath.core">
<fileset dir="${lib.core}">
@@ -115,7 +115,7 @@
<!-- =================================================================== -->
<!-- Prepare the build -->
<!-- =================================================================== -->
- <target name="prepare" depends="svn-prepare">
+ <target name="prepare">
<tstamp/>
<property file="VERSION.txt"/>
@@ -123,7 +123,7 @@
<echo message="-------------------------"/>
<echo message="eXist ${project.version} build"/>
<echo message="-------------------------"/>
- <echo message="SVN revision ${svn.revision}"/>
+ <echo message="GIT revision ${git.commit}"/>
<echo message=""/>
<echo message="${ant.version}"/>
<echo message="-------------------------"/>
@@ -134,7 +134,7 @@
<mkdir dir="${jetty.dir}/logs"/>
<mkdir dir="${jetty.dir}/work"/>
- <filter token="version" value="${project.version}-rev:${svn.revision}-${DSTAMP}"/>
+ <filter token="version" value="${project.version}-:${git.commit}-${DSTAMP}"/>
<filter token="database" value="native"/>
<copy file="${src.webapp}/xqts/config.xml.tmpl" tofile="${src.webapp}/xqts/config.xml"
@@ -274,10 +274,10 @@
<!-- Create jar files -->
<!-- ================================================================== -->
<target name="jar" depends="compile,compile-aspectj"
- description="Create eXist unsigned jar files">
+ description="Create eXist-db unsigned jar files">
<filter token="version" value="${project.version}"/>
<filter token="build" value="${DSTAMP}"/>
- <filter token="revision" value="${svn.revision}"/>
+ <filter token="revision" value="${git.commit}"/>
<!--copy file="${src}/CatalogManager.properties" todir="${build.classes}"/-->
<copy todir="${build.classes}/org/exist/client">
@@ -351,7 +351,7 @@
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
<attribute name="Project-CodeName" value="${project.codename}"/>
- <attribute name="SVN-Revision" value="${svn.revision}"/>
+ <attribute name="GIT-Revision" value="${git.commit}"/>
</manifest>
<exclude name="org/exist/*.xsl"/>
<exclude name="org/exist/ant/**"/>
@@ -377,7 +377,7 @@
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
<attribute name="Project-CodeName" value="${project.codename}"/>
- <attribute name="SVN-Revision" value="${svn.revision}"/>
+ <attribute name="GIT-Revision" value="${git.commit}"/>
</manifest>
<include name="org/exist/start/**"/>
</jar>
@@ -388,7 +388,7 @@
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
<attribute name="Project-CodeName" value="${project.codename}"/>
- <attribute name="SVN-Revision" value="${svn.revision}"/>
+ <attribute name="GIT-Revision" value="${git.commit}"/>
</manifest>
<include name="org/exist/*.xsl"/>
<include name="org/exist/ant/**"/>
View
12 build/scripts/dist.xml
@@ -2,7 +2,7 @@
<!-- $Id$ -->
<project basedir="../.." default="dist" name="dist">
- <description>Create eXist distribution</description>
+ <description>Create eXist-db distribution</description>
<!-- import common targets -->
<import file="../../build.xml"/>
@@ -31,8 +31,8 @@
<!-- ================================================================== -->
<!-- Create .war file -->
<!-- ================================================================== -->
- <target name="dist-war" depends="webapps,svn-prepare" description="Create war file">
- <war destfile="${dist}/exist-${project.version}-rev${svn.revision}.war" webxml="webapp/WEB-INF/web.xml">
+ <target name="dist-war" depends="webapps" description="Create war file">
+ <war destfile="${dist}/exist-${project.version}-rev${git.commit}.war" webxml="webapp/WEB-INF/web.xml">
<!-- Add files to WEB-INF/lib -->
<lib dir=".">
@@ -101,10 +101,6 @@
<lib dir="extensions/modules/lib">
<include name="*.jar"/>
</lib>
- <!-- Include content extraction jars if present -->
- <lib dir="extensions/contentextraction/lib">
- <include name="*.jar"/>
- </lib>
<!-- Add configuration files to WEB-INF -->
@@ -161,7 +157,7 @@
<attribute name="Project-Name" value="${project.name}"/>
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
- <attribute name="SVN-Revision" value="${svn.revision}"/>
+ <attribute name="GIT-Revision" value="${git.commit}"/>
</manifest>
</war>
View
25 build/scripts/installer.xml
@@ -2,7 +2,7 @@
<!-- ======================================================================= -->
<!-- eXist build file : Build installer -->
<!-- ======================================================================= -->
-<!-- $Id$ -->
+
<project basedir="../.." default="installer" name="Build installer">
<description>Build installer</description>
@@ -38,10 +38,9 @@
<delete dir="${jetty.dir}/work/Jetty__8080__exist"/>
<touch file="webapp/WEB-INF/logs/exist.log"/>
<touch file="webapp/WEB-INF/logs/xmldb.log"/>
-
<copy file="installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl"
tofile="installer/scripts/eXist-db.mac/Contents/Info.plist" filtering="true"
- overwrite="true">
+ overwrite="true">
<filterset>
<filter token="vmoptions" value=""/>
<filter token="classpath" value="$APP_PACKAGE/.."/>
@@ -128,7 +127,7 @@
<target depends="prepare-installer,launcher-exe,commandline-installer" name="installer" description="Create installer">
<echo message="Calling IzPack to create installer ..."/>
- <property name="inst-jar" value="installer/${project.name}-setup-${project.version}-rev${svn.revision}.jar"/>
+ <property name="inst-jar" value="installer/${project.name}-setup-${project.version}-rev${git.commit}.jar"/>
<izpack input="installer/install.xml"
output="${inst-jar}"
basedir="." izPackDir="${izpack.dir}"
@@ -158,23 +157,23 @@
classname="net.sf.launch4j.ant.Launch4jTask"
classpath="${launch4j.dir}/launch4j.jar:${launch4j.dir}/lib/xstream.jar" />
- <echo message="${svn.revision}"/>
- <launch4j configFile="installer/launch4j-start.xml" fileVersion="${project.version.numeric}.${svn.revision}"
- txtFileVersion="${project.version}-rev${svn.revision}"
- productVersion="${project.version.numeric}.${svn.revision}"/-->
+ <echo message="${git.commit}"/>
+ <launch4j configFile="installer/launch4j-start.xml" fileVersion="${project.version.numeric}.${git.commit}"
+ txtFileVersion="${project.version}-rev${git.commit}"
+ productVersion="${project.version.numeric}.${git.commit}"/-->
</target>
<target depends="installer" name="installer-exe" description="Create .exe from installer">
<taskdef name="launch4j"
classname="net.sf.launch4j.ant.Launch4jTask"
classpath="${launch4j.dir}/launch4j.jar:${launch4j.dir}/lib/xstream.jar" />
- <property name="inst-jar" value="installer/${project.name}-setup-${project.version}-rev${svn.revision}.jar"/>
- <property name="inst-exe" value="installer/${project.name}-setup-${project.version}-rev${svn.revision}.exe"/>
+ <property name="inst-jar" value="installer/${project.name}-setup-${project.version}-rev${git.commit}.jar"/>
+ <property name="inst-exe" value="installer/${project.name}-setup-${project.version}-rev${git.commit}.exe"/>
<launch4j configFile="installer/launch4j.xml" jar="${inst-jar}"
- outfile="${inst-exe}" fileVersion="${project.version.numeric}.${svn.revision}"
- txtFileVersion="${project.version}-rev${svn.revision}"
- productVersion="${project.version.numeric}.${svn.revision}"/>
+ outfile="${inst-exe}" fileVersion="${project.version.numeric}.${git.commit}"
+ txtFileVersion="${project.version}-rev${git.commit}"
+ productVersion="${project.version.numeric}.${git.commit}"/>
</target>
<target name="copy_scripts">
View
125 build/scripts/subversion.xml
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ======================================================================= -->
-<!-- eXist build file : Subversion -->
-<!-- ======================================================================= -->
-
-<!-- $Id$ -->
-
-<!--
- Note:
- Both svnkit jar files are written into the user.lib directory. Unfortunately
- not all ant tasks can find the jar files via the classpath. As a work around in
- build.sh and build.xml the jar files are added to the LOCALCLASSPATH variable.
-
- I realize that this is not the best solution, we'll need to think of a better way.
- [e.g. copy jars into both lib/user and ant/lib]
-
-
- Note:
- svnkit 1.7.0 has some more jar-dependancies compared to 1.3.x ; therefore it probably
- a better idea to download the complete jar set using a tool like ivy.
--->
-
-<project basedir="../.." name="SubVersion">
-
- <description>Subversion tasks</description>
-
- <property name="svnkit.repo" value="http://maven.tmatesoft.com/content/repositories/releases"/>
- <property name="svnkit.version" value="1.3.7"/>
-
- <property name="svn.svnkit.jar" value="${lib.user}/svnkit.jar"/>
- <property name="svn.tmp.svnkit.jar" value="${lib.user}/svnkit-${svnkit.version}.jar"/>
-
- <property name="svn.svnkitcli.jar" value="${lib.user}/svnkit-cli.jar"/>
- <property name="svn.tmp.svnkitcli.jar" value="${lib.user}/svnkit-cli-${svnkit.version}.jar"/>
-
- <property name="svn.patch.file" value="exist.patch"/>
-
-
-
- <available classname="org.tmatesoft.svn.cli.SVN" property="svn-present"/>
-
-
- <!--
- Try to read SVN info from entries-file (if file exist).
- Fallback to VERSION.txt if subversion is not available.
- -->
- <target name="svn-prepare" if="svn-present">
- <echo>Determining local SVN revision</echo>
-
- <taskdef name="svninfo" classname="nl.ow.dilemma.ant.svn.SubversionInfoTask"/>
-
- <tstamp/>
-
- <svninfo username="anonymous" password="anonymous"/>
-
- <echo>Updating VERSION.txt</echo>
- <propertyfile file="VERSION.txt" comment="eXist build info (updated using svnkit)">
- <entry key="project.version" value="${project.version}"/>
- <entry key="project.build" value="${DSTAMP}"/>
- <entry key="svn.revision" value="${svn.revision}"/>
- </propertyfile>
- </target>
-
-
- <!--
- Download jar files the author website. This is newest version of the library,
- if the URL is updated in time. The download size is significantly larger.
- -->
- <target name="svn-download" description="Download latest SVN library.">
-
- <taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask"/>
-
- <!-- Get file and rename -->
- <fetch dest="${lib.user}"
- url="${svnkit.repo}/org/tmatesoft/svnkit/svnkit-cli/${svnkit.version}/svnkit-cli-${svnkit.version}.jar"
- classname="org.tmatesoft.svn.cli.SVN"/>
-
- <!-- required to get rid of version-info in filename -->
- <move file="${svn.tmp.svnkitcli.jar}" tofile="${svn.svnkitcli.jar}" failonerror="false"/>
-
- <!-- Get file and rename -->
- <fetch classpathref="classpath.core" dest="${lib.user}"
- url="${svnkit.repo}/org/tmatesoft/svnkit/svnkit/${svnkit.version}/svnkit-${svnkit.version}.jar"
- classname="org.tmatesoft.svn.util.Version"/>
-
- <!-- required to get rid of version-info in filename -->
- <move file="${svn.tmp.svnkit.jar}" tofile="${svn.svnkit.jar}" failonerror="false"/>
- </target>
-
- <!--
- Create patch; unfortunately VERSION.txt is included as well.
- -->
- <target name="svn-diff" description="Make patch.">
-
- <echo>Generating patch file '${svn.patch.file}'....</echo>
- <java classname="org.tmatesoft.svn.cli.SVN" dir="." fork="true" output="${svn.patch.file}">
- <arg value="diff"/>
- <arg value="."/>
- <classpath>
- <pathelement location="${svn.svnkit.jar}"/>
- <pathelement location="${svn.svnkitcli.jar}"/>
- </classpath>
- </java>
- <echo>Reminder: please remove all VERSION.txt diffs from the file '${svn.patch.file}'.</echo>
- </target>
-
- <!--
- Check out / update sources from subversion code archive.
- -->
- <target name="svn-update" description="Update project from SubVersion archive.">
- <property name="source-root" value="."/>
- <property name="repository.URL" value="https://exist.svn.sourceforge.net/svnroot/exist"/>
- <java classname="org.tmatesoft.svn.cli.SVN" dir="." fork="true">
- <arg value="co"/>
- <arg value="${repository.URL}/trunk/eXist"/>
- <arg value="${source-root}"/>
- <classpath>
- <pathelement location="${svn.svnkit.jar}"/>
- <pathelement location="${svn.svnkitcli.jar}"/>
- </classpath>
- </java>
- </target>
-
-</project>

0 comments on commit 77f9141

Please sign in to comment.
Something went wrong with that request. Please try again.