You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/10/03 00:29:18 UTC
svn commit: r452245 - in /incubator/harmony/enhanced/drlvm/trunk/build:
build.bat build.sh make/components/extra.xml make/deploy.xml
make/lnx.properties make/setup.xml make/win.properties
Author: geirm
Date: Mon Oct 2 15:29:17 2006
New Revision: 452245
URL: http://svn.apache.org/viewvc?view=rev&rev=452245
Log:
HARMONY-698
This should be equivalent to what HARMONY-698 was
trying to achieve.
it removes the dependency on eclipse as well as the
hy plugin.
Tested in linux. Will now test on windows
Modified:
incubator/harmony/enhanced/drlvm/trunk/build/build.bat
incubator/harmony/enhanced/drlvm/trunk/build/build.sh
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.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/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?view=diff&rev=452245&r1=452244&r2=452245
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.bat (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.bat Mon Oct 2 15:29:17 2006
@@ -122,8 +122,6 @@
REM ===================
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
SET CLASSPATH=%CLASSPATH%;.\make\tmp\xalan.jar
Modified: incubator/harmony/enhanced/drlvm/trunk/build/build.sh
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/build.sh?view=diff&rev=452245&r1=452244&r2=452245
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/build.sh (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/build.sh Mon Oct 2 15:29:17 2006
@@ -68,8 +68,6 @@
export CXX
export BUILD_CFG
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
CLASSPATH=$CLASSPATH:`pwd`/make/tmp/xalan.jar
CLASSPATH=`pwd`/make/tmp/cpptasks/patched.classes:$CLASSPATH
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml?view=diff&rev=452245&r1=452244&r2=452245
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml Mon Oct 2 15:29:17 2006
@@ -31,7 +31,6 @@
extra.apriconv,
extra.aprutil,
extra.eclipse_script,
- extra.hyplugin,
extra.java_script,
extra.jre_libraries,
extra.log4cxx,
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?view=diff&rev=452245&r1=452244&r2=452245
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml Mon Oct 2 15:29:17 2006
@@ -80,10 +80,5 @@
</zlib>
</select>
-<!-- <hyplugin>
- <jar>lib:*</jar>
- </hyplugin>
--->
-
</extra>
</deploy>
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?view=diff&rev=452245&r1=452244&r2=452245
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/lnx.properties Mon Oct 2 15:29:17 2006
@@ -33,7 +33,7 @@
# http://download.eclipse.org/eclipse/downloads/
#remote.ECLIPSE.archive=http://anak.kambing.vlsm.org/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-linux-gtk.tar.gz
-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
+#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
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?view=diff&rev=452245&r1=452244&r2=452245
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/setup.xml Mon Oct 2 15:29:17 2006
@@ -102,9 +102,7 @@
<property name="APRICONV.check.file" value="lib/api_version.c" />
<property name="LOG4CXX.check.file" value="configure.in" />
<property name="ZLIB.check.file" value="zlib1.dll" />
- <property name="HYPLUGIN.check.file" value="src/org/apache/harmony/eclipse/jdt/launching/HyLaunchingPlugin.java" />
<property name="CLASSLIB.check.file" value="native-src/README.txt" />
- <property name="ECLIPSE.check.file" value="plugins/org.eclipse.jdt.core_3.1.1.jar" />
<property name="XALAN.check.file" value="xalan.jar" />
<property name="VM.check.file" value="vmcore/src/init/vm_main.cpp" />
<property name="ANTLR.check.file" value="antlr-2.7.5.jar" />
@@ -149,22 +147,6 @@
</target>
<target name="copy.nessessary.jars">
- <propertyregex property="build.ECLIPSE.path" input="${if.ECLIPSE.exist}" regexp="(.*)/${ECLIPSE.check.file}" select="\1" />
- <unzip dest="tmp">
- <fileset dir="${build.ECLIPSE.path}" includes="plugins/org.eclipse.jdt.core_3.1.1.jar" />
- <patternset>
- <include name="jdtCompilerAdapter.jar" />
- </patternset>
- </unzip>
- <copy tofile="tmp/org.eclipse.jdt.core_3.1.1.jar">
- <fileset dir="${build.ECLIPSE.path}" includes="plugins/org.eclipse.jdt.core_3.1.1.jar" />
- </copy>
- <copy tofile="tmp/junit.jar">
- <fileset dir="${build.ECLIPSE.path}">
- <include name="plugins/org.junit_3.8.1/junit.jar" />
- </fileset>
- </copy>
-
<propertyregex property="build.XALAN.path" input="${if.XALAN.exist}" regexp="(.*)/${XALAN.check.file}" select="\1" />
<copy file="${build.XALAN.path}/xalan.jar" todir="tmp" />
@@ -194,17 +176,17 @@
<target name="setup.resources" depends="plugin.antcontrib">
- <property name="common.resources" value="LOG4CXX,HYPLUGIN,CPPTASKS,XALAN,VM,ANTLR,PATCHES" />
- <property name="build.resources" value="CPPTASKS,ECLIPSE" />
+ <property name="common.resources" value="LOG4CXX,CPPTASKS,XALAN,VM,ANTLR,PATCHES" />
+ <property name="build.resources" value="CPPTASKS" />
<if>
<isset property="if.lnx" />
<then>
<property name="build.os.short" value="lnx" />
- <property name="os.resources" value="APR,APRUTIL,APRICONV,ECLIPSE" />
+ <property name="os.resources" value="APR,APRUTIL,APRICONV" />
</then>
<else>
<property name="build.os.short" value="win" />
- <property name="os.resources" value="APR,APRUTIL,APRICONV,ECLIPSE,ZLIB" />
+ <property name="os.resources" value="APR,APRUTIL,APRICONV,ZLIB" />
</else>
</if>
</target>
@@ -318,13 +300,8 @@
<condition>
<not>
<and>
- <available file="tmp/jdtCompilerAdapter.jar" />
- <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/win.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties?view=diff&rev=452245&r1=452244&r2=452245
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/win.properties Mon Oct 2 15:29:17 2006
@@ -32,7 +32,7 @@
# Eclipse SDK, version 3.1.1 EXACTLY
# http://download.eclipse.org/eclipse/downloads/
#remote.ECLIPSE.archive=http://eclipse.objectweb.org/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-win32.zip
-remote.ECLIPSE.archive=http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-win32.zip
+#remote.ECLIPSE.archive=http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-win32.zip
# Cpptasks, version 1.0 beta 3 or above
# http://sourceforge.net/project/showfiles.php?group_id=36177