commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1084127 - in /commons/sandbox/runtime/trunk: build.properties.in build.xml configure src/
Date Tue, 22 Mar 2011 10:46:47 GMT
Author: mturk
Date: Tue Mar 22 10:46:46 2011
New Revision: 1084127

URL: http://svn.apache.org/viewvc?rev=1084127&view=rev
Log:
Axe old code. Prepare for a modified version and scope

Removed:
    commons/sandbox/runtime/trunk/src/
Modified:
    commons/sandbox/runtime/trunk/build.properties.in
    commons/sandbox/runtime/trunk/build.xml
    commons/sandbox/runtime/trunk/configure

Modified: commons/sandbox/runtime/trunk/build.properties.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.properties.in?rev=1084127&r1=1084126&r2=1084127&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.properties.in (original)
+++ commons/sandbox/runtime/trunk/build.properties.in Tue Mar 22 10:46:46 2011
@@ -40,4 +40,4 @@ compile.deprecation=@deprecate@
 # ----- Change Cross Compile target -------------------------------------------
 systemid.os=@host@
 systemid.cpu=@cpu@
-systemid.so=@ext@
+systemid.so=@soext@

Modified: commons/sandbox/runtime/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/build.xml?rev=1084127&r1=1084126&r2=1084127&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/build.xml (original)
+++ commons/sandbox/runtime/trunk/build.xml Tue Mar 22 10:46:46 2011
@@ -47,8 +47,8 @@
     <property name="runtime.libname" value="libacr"/>
     <property name="runtime.library.path" value="${src.native}"/>
 
-    <property name="compile.source" value="1.5"/>
-    <property name="compile.target" value="1.5"/>
+    <property name="compile.source" value="1.6"/>
+    <property name="compile.target" value="1.6"/>
     <property name="compile.debug" value="off"/>
     <property name="compile.optimize" value="on"/>
     <property name="compile.deprecation" value="on"/>
@@ -104,27 +104,6 @@
 
     <target name="prepare" depends="env">
         <mkdir dir="${build.dir}"/>
-        <condition property="java7.code.start" value="///*"
-                   else="/* Section commented by Ant.">
-            <equals arg1="${compile.source}" arg2="1.7"/>
-        </condition>
-        <condition property="java7.code.end" value="//*/" else="*/">
-            <equals arg1="${compile.source}" arg2="1.7"/>
-        </condition>
-        <condition property="java6.code.start" value="///*"
-                   else="/* Section commented by Ant.">
-            <equals arg1="${compile.source}" arg2="1.6"/>
-        </condition>
-        <condition property="java6.code.end" value="//*/" else="*/">
-            <equals arg1="${compile.source}" arg2="1.6"/>
-        </condition>
-        <condition property="java5.code.start" value="///*"
-                   else="/* Section commented by Ant.">
-            <equals arg1="${compile.source}" arg2="1.5"/>
-        </condition>
-        <condition property="java5.code.end" value="//*/" else="*/">
-            <equals arg1="${compile.source}" arg2="1.5"/>
-        </condition>
         <tstamp>
             <format property="YEAR"   pattern="yyyy" locale="en"/>
             <format property="TODAY"  pattern="MMM d yyyy" locale="en"/>
@@ -188,28 +167,12 @@ The Apache Software Foundation (http://w
             classname="${build.package.name}.ant.SystemIdTask">
             <classpath refid="task.classpath"/>
         </taskdef>
-        <taskdef name="conditional"
-            classname="${build.package.name}.ant.ConditionalTask">
-            <classpath refid="task.classpath"/>
-        </taskdef>
         <taskdef name="uuid"
             classname="${build.package.name}.ant.UuidTask">
             <classpath refid="task.classpath"/>
         </taskdef>
-        <taskdef name="variable"
-            classname="${build.package.name}.ant.VolatileProperty">
-            <classpath refid="task.classpath"/>
-        </taskdef>
-        <taskdef name="cexec"
-            classname="${build.package.name}.ant.ConditionalExecTask">
-            <classpath refid="task.classpath"/>
-        </taskdef>
-        <taskdef name="info"
-            classname="${build.package.name}.ant.FormattedEchoTask">
-            <classpath refid="task.classpath"/>
-        </taskdef>
         <uuid property="build.uuid" />
-        <systemid prefix="systemid" />
+        <systemid property="systemid" />
     </target>
 
     <!-- =================================================================== -->
@@ -233,12 +196,6 @@ The Apache Software Foundation (http://w
         <filter token="VERSION_PNAME"  value="${final.name}"/>
         <filter token="VERSION_BUILT"  value="${TODAY} ${TSTAMP}"/>
         <filter token="VERSION_UUID"   value="${build.uuid}"/>
-        <filter token="JAVA7_CODE[["   value="${java7.code.start}"/>
-        <filter token="]]JAVA7_CODE"   value="${java7.code.end}"/>
-        <filter token="JAVA6_CODE[["   value="${java6.code.start}"/>
-        <filter token="]]JAVA6_CODE"   value="${java6.code.end}"/>
-        <filter token="JAVA5_CODE[["   value="${java5.code.start}"/>
-        <filter token="]]JAVA5_CODE"   value="${java5.code.end}"/>
         <copy todir="${build.src}/java" filtering="yes">
             <fileset dir="${src.java}/main/java">
                 <include name="**/*.java"/>
@@ -316,7 +273,6 @@ The Apache Software Foundation (http://w
     <!-- ================================================================== -->
     <target name="jar" depends="compile"
         description="Generates the Jar file">
-        <systemid prefix="systemid" />
         <jar
             destfile="${build.dir}/${final.name}.jar"
             basedir="${build.dest}/java"
@@ -340,7 +296,6 @@ The Apache Software Foundation (http://w
     <!-- ================================================================== -->
     <target name="native-jar" depends="compile"
         description="Generates the Jar file">
-        <systemid prefix="systemid" />
         <copy todir="${build.dest}/java/${build.package.path}/platform/${systemid.os}">
             <fileset dir="${runtime.library.path}">
                 <include name="*.${systemid.so}"/>

Modified: commons/sandbox/runtime/trunk/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/configure?rev=1084127&r1=1084126&r2=1084127&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/configure (original)
+++ commons/sandbox/runtime/trunk/configure Tue Mar 22 10:46:46 2011
@@ -32,8 +32,8 @@ name=commons-runtime
 topdir="${TOPDIR:=.}"
 java_home="`echo $JAVA_HOME | tr '\\' '/' 2>/dev/null`"
 
-compile_source=5
-compile_target=5
+compile_source=6
+compile_target=6
 has_64_bit=no
 has_maintainer_mode=off
 has_debug=off
@@ -148,11 +148,11 @@ tolower()
 major_sed='/#define.*ACR_MAJOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
 minor_sed='/#define.*ACR_MINOR_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
 patch_sed='/#define.*ACR_PATCH_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
-devel_sed='/#define.*ACR_IS_DEV_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
-vmajor="`sed -n $major_sed $topdir/src/main/native/include/acr_version.h`"
-vminor="`sed -n $minor_sed $topdir/src/main/native/include/acr_version.h`"
-vpatch="`sed -n $patch_sed $topdir/src/main/native/include/acr_version.h`"
-vdevel="`sed -n $devel_sed $topdir/src/main/native/include/acr_version.h`"
+devel_sed='/#define.*ACR_ISDEV_VERSION/s/^[^0-9]*\([0-9]*\).*$/\1/p'
+vmajor="`sed -n $major_sed $topdir/src/main/native/include/acr/version.h`"
+vminor="`sed -n $minor_sed $topdir/src/main/native/include/acr/version.h`"
+vpatch="`sed -n $patch_sed $topdir/src/main/native/include/acr/version.h`"
+vdevel="`sed -n $devel_sed $topdir/src/main/native/include/acr/version.h`"
 
 
 if [ "$vdelel" = ".0" ]; then
@@ -178,7 +178,7 @@ case "$host" in
     ;;
     cygwin* )
         host=windows
-        ext="dll"
+        soext="dll"
     ;;
     mingw* )
         host=windows
@@ -220,7 +220,7 @@ sed -e "s;=@name@;=$name;g" \
     -e "s;=@deprecate@;=$has_deprecation;g" \
     -e "s;@host@;$host;g" \
     -e "s;@cpu@;$mach;g" \
-    -e "s;@ext@;$soext;g" \
+    -e "s;@soext@;$soext;g" \
     build.properties.in > build.properties
 
 echo ""



Mime
View raw message