harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r418785 - in /incubator/harmony/enhanced/drlvm/trunk/build: build.bat build.sh make/build.xml make/lnx.properties make/setup.xml make/targets/build.native.xml make/win.properties
Date Mon, 03 Jul 2006 15:02:08 GMT
Author: hindessm
Date: Mon Jul  3 08:02:08 2006
New Revision: 418785

URL: http://svn.apache.org/viewvc?rev=418785&view=rev
Log:
Applied patch from "[#HARMONY-697] drlvm: Remove cpptasks patching and move to cpptasks 1.0b4".

Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/build.bat
    incubator/harmony/enhanced/drlvm/trunk/build/build.sh
    incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties
    incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties

Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.bat
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.bat?rev=418785&r1=418784&r2=418785&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.bat (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.bat Mon Jul  3 08:02:08 2006
@@ -121,7 +121,7 @@
 REM Executing Ant build
 REM ===================
 
-SET CLASSPATH=%CD%\make\tmp\cpptasks\cpptasks.jar
+SET CLASSPATH=%CD%\make\tmp\cpptasks.jar
 SET CLASSPATH=%CLASSPATH%;.\make\tmp\org.eclipse.jdt.core_3.1.1.jar
 SET CLASSPATH=%CLASSPATH%;.\make\tmp\jdtCompilerAdapter.jar
 SET CLASSPATH=%CLASSPATH%;.\make\tmp\junit.jar

Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.sh
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.sh?rev=418785&r1=418784&r2=418785&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.sh (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.sh Mon Jul  3 08:02:08 2006
@@ -72,7 +72,7 @@
 export ANT_HOME=`(cd $ANT_HOME;pwd)`
 export CXX
 export BUILD_CFG
-CLASSPATH=`pwd`/make/tmp/cpptasks/cpptasks.jar
+CLASSPATH=`pwd`/make/tmp/cpptasks.jar
 CLASSPATH=$CLASSPATH:`pwd`/make/tmp/org.eclipse.jdt.core_3.1.1.jar;
 CLASSPATH=$CLASSPATH:`pwd`/make/tmp/jdtCompilerAdapter.jar
 CLASSPATH=$CLASSPATH:`pwd`/make/tmp/junit.jar

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml?rev=418785&r1=418784&r2=418785&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Mon Jul  3 08:02:08 2006
@@ -232,14 +232,12 @@
         <!-- plug in the CPPTASKS -->
         <taskdef resource="cpptasks.tasks">
             <classpath>
-                <pathelement location="./tmp/cpptasks/patched.classes" />
-                <pathelement location="./tmp/cpptasks/cpptasks.jar" />
+                <pathelement location="./tmp/cpptasks.jar" />
             </classpath>
         </taskdef>
         <typedef resource="cpptasks.types">
             <classpath>
-                <pathelement location="./tmp/cpptasks/patched.classes" />
-                <pathelement location="./tmp/cpptasks/cpptasks.jar" />
+                <pathelement location="./tmp/cpptasks.jar" />
             </classpath>
         </typedef>
     </target>

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties?rev=418785&r1=418784&r2=418785&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties Mon Jul  3 08:02:08 2006
@@ -38,7 +38,7 @@
 remote.ECLIPSE.archive=http://mirrors.cat.pdx.edu/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-linux-gtk.tar.gz
 # Cpptasks, version 1.0 beta 3 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177
-remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b3.zip
+remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
 
 # Ant-contrib, version 0.6 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml?rev=418785&r1=418784&r2=418785&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml Mon Jul  3 08:02:08 2006
@@ -57,11 +57,14 @@
                 <available file="tmp/ant-contrib.jar" />
             </and>
         </condition>
+
+        <!-- cpptasks patching removed  
         <condition property="cpptasks.patched">
             <and>
                 <available file="tmp/patched.txt" />
             </and>
         </condition>
+        -->
         <echo message="jars: ${jars.exist}" />
     </target>
 
@@ -87,8 +90,7 @@
                                                       download.remote.files,
                                                       unzip.resources,
                                                       check.unzipped.externals,
-                                                      copy.nessessary.jars,
-                                                      execute.cpptasks.patch.with.eclipse.compiler.in.classpath">
+                                                      copy.nessessary.jars">
     </target>
 
 
@@ -108,61 +110,6 @@
         <property name="RESOLVER.check.file" value="resolver.jar" />
     </target>
 
-    <!-- Patching CPPTASKS before using it. -->
-    <!-- We do it in separate ant process.  -->
-    <target name="patch.cpptasks" depends="plugin.antcontrib" unless="cpptasks.patched">
-        <mkdir dir="tmp/cpptasks/patched.src" />
-        <mkdir dir="tmp/cpptasks/patched.classes" />
-        <property environment="env" />
-        <echo message="Patching CPPTASKS..." />
-        <!-- patching itself: 3 files -->
-        <property name="files.to.patch" value="net/sf/antcontrib/cpptasks/devstudio/DevStudioCCompiler.java
net/sf/antcontrib/cpptasks/intel/IntelWin32CCompiler.java net/sf/antcontrib/cpptasks/intel/IntelWin64CCompiler.java"
/>
-
-        <for list="${files.to.patch}" param="filename" delimiter=" ">
-            <sequential>
-                <copy todir="tmp/cpptasks/patched.src">
-                    <fileset dir="${env.CPPTASKS_HOME}">
-                        <include name="**/src/@{filename}" />
-                    </fileset>
-                </copy>
-            </sequential>
-        </for>
-
-        <fileset id="src.files" dir="tmp/cpptasks/patched.src">
-            <include name="**/*" />
-        </fileset>
-
-        <for param="filename">
-            <fileset refid="src.files" />
-            <sequential>
-                <loadfile property="file.content.@{filename}" srcFile="@{filename}" />
-
-                <propertyregex property="file.patched.content" input="${file.content.@{filename}}"
override="true" regexp="(?m)(public\s+int\s+getMaximumCommandLength\(\)\s+\{\s*$\s+)return
1024;" replace="\1return 65535;" defaultValue="${file.content.@{filename}}" />
-
-                <!-- patch the file only if something's changed -->
-                <if>
-                    <not>
-                        <equals arg1="${file.content.@{filename}}" arg2="${file.patched.content}"
/>
-                    </not>
-                    <then>
-                        <echo file="@{filename}" message="${file.patched.content}" />
-                    </then>
-                </if>
-            </sequential>
-        </for>
-
-        <!-- compile the patched source -->
-        <javac srcdir="tmp/cpptasks/patched.src" destdir="tmp/cpptasks/patched.classes"
source="1.4" target="1.4" failonerror="true">
-            <classpath>
-                <fileset dir="${env.CPPTASKS_HOME}" includes="**/*.jar" />
-                <fileset dir="${java.home}" includes="**/*.jar" />
-            </classpath>
-            <patternset>
-                <include name="**/*.java" />
-            </patternset>
-        </javac>
-        <echo file="tmp/patched.txt" message="done" />
-    </target>
 
 
     <target name="check.unzipped.externals" depends="init,setup.check.files,setup.properties">
@@ -232,7 +179,7 @@
         </fail>
         <copy file="${build.XALAN.path}/serializer.jar" todir="tmp" />
         <propertyregex property="build.CPPTASKS.path" input="${if.CPPTASKS.exist}" regexp="(.*)/${CPPTASKS.check.file}"
select="\1" />
-        <copy file="${build.CPPTASKS.path}/cpptasks.jar" todir="tmp/cpptasks" />
+        <copy file="${build.CPPTASKS.path}/cpptasks.jar" todir="tmp" />
         <echo message="done" file="tmp/done.txt" />
     </target>
 
@@ -253,64 +200,7 @@
         </for>
     </target>
 
-    <target name="execute.cpptasks.patch.with.eclipse.compiler.in.classpath" unless="cpptasks.patched"
depends="init, setup.resources, copy.nessessary.jars">
-        <path id="class.path">
-            <pathelement location="tmp\org.eclipse.jdt.core_3.1.1.jar" />
-            <pathelement location="tmp\jdtCompilerAdapter.jar" />
-            <pathelement location="tmp\junit*.jar" />
-            <pathelement location="tmp\xalan.jar" />
-            <pathelement location="tmp\cpptasks\patched.classes" />
-            <pathelement location="tmp\cpptasks\cpptasks.jar" />
-        </path>
-        <pathconvert refid="class.path" property="class.line" />
-        <property name="setup.file" location="./setup.xml" />
-        <property name="cpptasks.home" location="${build.CPPTASKS.path}" />
 
-        <if>
-            <isset property="if.win" />
-            <then>
-                <if>
-                    <available file="${env.JAVA_HOME}\bin\ij.exe" />
-                    <then>
-                        <exec executable="${env.JAVA_HOME}\bin\ij.exe">
-                            <arg line="-Duser.timezone=en_US -classpath ${env.ANT_HOME}\lib\ant-launcher.jar
-Dant.home=${env.ANT_HOME} org.apache.tools.ant.launch.Launcher -cp ${class.line} -Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
-f ${setup.file} patch.cpptasks" />
-                            <env key="CLASSPATH" value="${class.line}" />
-                            <env key="CPPTASKS_HOME" value="${cpptasks.home}" />
-                        </exec>
-                    </then>
-                    <else>
-                        <exec executable="${env.ANT_HOME}\bin\ant.bat">
-                            <arg line=" -f ${setup.file} patch.cpptasks -Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter"
/>
-                            <env key="CLASSPATH" value="${class.line}" />
-                            <env key="CPPTASKS_HOME" value="${cpptasks.home}" />
-                        </exec>
-                    </else>
-                </if>
-            </then>
-        </if>
-        <if>
-            <isset property="if.lnx" />
-            <then>
-                <if>
-                    <available file="${env.JAVA_HOME}/bin/ij" />
-                    <then>
-                        <exec executable="${env.JAVA_HOME}/bin/ij">
-                            <arg line="-Duser.timezone=en_US -classpath ${env.ANT_HOME}/lib/ant-launcher.jar
-Dant.home=${env.ANT_HOME} org.apache.tools.ant.launch.Launcher -cp ${class.line} -Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
-f ${setup.file} patch.cpptasks" />
-                            <env key="CLASSPATH" value="${class.line}" />
-                            <env key="CPPTASKS_HOME" value="${cpptasks.home}" />
-                        </exec>
-                    </then>
-                    <else>
-                        <exec executable="${env.ANT_HOME}/bin/ant">
-                            <arg line=" --noconfig -f ${setup.file} patch.cpptasks -Dbuild.compiler=org.eclipse.jdt.core.JDTCompilerAdapter"
/>
-                            <env key="CLASSPATH" value="${class.line}" />
-                            <env key="CPPTASKS_HOME" value="${cpptasks.home}" />
-                        </exec>
-                    </else>
-                </if>
-            </then>
-        </if>
-    </target>
 
     <target name="setup.resources" depends="plugin.antcontrib">
         <property name="common.resources" value="LOG4CXX,HYPLUGIN,CPPTASKS,XALAN,VM,BCPROV,RESOLVER"
/>
@@ -441,7 +331,9 @@
                         <available file="tmp/org.eclipse.jdt.core_3.1.1.jar" />
                         <available file="tmp/junit.jar" />
                         <available file="tmp/xalan.jar" />
+			<!-- Removed cpptasks patching
                         <available file="tmp/cpptasks/cpptasks.jar" />
+ 			-->
                     </and>
                 </not>
             </condition>Error:

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml?rev=418785&r1=418784&r2=418785&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/targets/build.native.xml Mon Jul  3
08:02:08 2006
@@ -89,7 +89,7 @@
     <!-- compiles c sources ${c.compiler} must be set in the component descriptor 
                 to point what sources have to be compiled -->
     <target name="build.native.c" depends="build.native.init" if="have.to.rebuild">
-        <cc objdir="${build.dir}/_obj" debug="${is.cfg.debug}" runtime="static" multithreaded="true">
+        <cc objdir="${build.dir}/_obj" debug="${is.cfg.debug}" runtime="static" multithreaded="true"
subsystem="console">
             <compiler refid="c.compiler" />
             <select os="win">
                 <compilerarg value="/Zi" />
@@ -104,7 +104,7 @@
     <!-- compiles cpp sources ${cpp.compiler} must be set in the component descriptor

                 to point what sources have to be compiled -->
     <target name="build.native.cpp" depends="build.native.init" if="have.to.rebuild">
-        <cc objdir="${build.dir}/_obj" debug="${is.cfg.debug}" runtime="static" multithreaded="true">
+        <cc objdir="${build.dir}/_obj" debug="${is.cfg.debug}" runtime="static" multithreaded="true"
 subsystem="console">
             <compiler refid="cpp.compiler" />
             <select os="win">
                 <compilerarg value="/Zi" />
@@ -199,7 +199,7 @@
         <cc name="${build.cxx}"
             debug="${is.cfg.debug}"
             outfile="${lib.out.dir}/${libname}"
-            outtype="${outtype}">
+            outtype="${outtype}"  subsystem="console">
             <select os="win">
                 <linkerarg value="/pdb:${build.dir}/_bin/${libname}.pdb" />
                 <linkerarg value="/debug" />

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties?rev=418785&r1=418784&r2=418785&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties Mon Jul  3 08:02:08 2006
@@ -37,7 +37,7 @@
 
 # Cpptasks, version 1.0 beta 3 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177
-remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b3.zip
+remote.CPPTASKS.archive=http://heanet.dl.sourceforge.net/sourceforge/ant-contrib/cpptasks-1.0b4.zip
 
 # Ant-contrib, version 0.6 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177



Mime
View raw message