[EMAIL PROTECTED] wrote:
Author: antonio
Date: Sat May 6 21:44:18 2006
New Revision: 400414
URL: http://svn.apache.org/viewcvs?rev=400414&view=rev
Log:
Activating java 1.5 compile and run for Linux.
Is Lenya 1.4-dev really working with Java 1.5 ?
AFAIK it doesn't work without changes ... and this is why we made the
build process stop for Java 1.5 such that people know.
Thanks
Michi
Removed:
lenya/trunk/lib/endorsed/
Modified:
lenya/trunk/build.sh
lenya/trunk/lenya.sh
lenya/trunk/src/targets/properties-build.xml
Modified: lenya/trunk/build.sh
URL:
http://svn.apache.org/viewcvs/lenya/trunk/build.sh?rev=400414&r1=400413&r2=400414&view=diff
==============================================================================
--- lenya/trunk/build.sh (original)
+++ lenya/trunk/build.sh Sat May 6 21:44:18 2006
@@ -29,6 +29,8 @@
OLD_CLASSPATH="$CLASSPATH"
unset CLASSPATH
CLASSPATH="`echo lib/*.jar | tr ' ' $S`"
+# Add cocoon endorsed libs
+CLASSPATH="$CLASSPATH `echo externals/cocoon_2_1_x/lib/endorsed/*.jar | tr ' '
$S`"
export CLASSPATH
# ----- Use Ant shipped with Lenya. Ignore installed in the system Ant
Modified: lenya/trunk/lenya.sh
URL:
http://svn.apache.org/viewcvs/lenya/trunk/lenya.sh?rev=400414&r1=400413&r2=400414&view=diff
==============================================================================
--- lenya/trunk/lenya.sh (original)
+++ lenya/trunk/lenya.sh Sat May 6 21:44:18 2006
@@ -148,7 +148,7 @@
# ----- Set Local Variables ( used to minimize cut/paste) ---------------------
JAVA="$JAVA_HOME/bin/java"
-ENDORSED_LIBS="$LENYA_LIB/endorsed"
+ENDORSED_LIBS="${LENYA_HOME}/externals/cocoon_2_1_x/lib/endorsed"
ENDORSED="-Djava.endorsed.dirs=$ENDORSED_LIBS"
PARSER=-Dorg.xml.sax.parser=org.apache.xerces.parsers.SAXParser
LOADER=Loader
Modified: lenya/trunk/src/targets/properties-build.xml
URL:
http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?rev=400414&r1=400413&r2=400414&view=diff
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Sat May 6 21:44:18 2006
@@ -52,12 +52,17 @@
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
<property name="nowarn" value="off"/>
- <property name="target.vm" value="1.4"/>
-
-<!-- http://article.gmane.org/gmane.comp.cms.lenya.user/9712 -->
-<!--
- <property name="target.vm" value="1.5"/>
--->
+ <!-- Detecting the current jvm -->
+ <condition property="target.vm" value="${ant.java.version}">
+ <not>
+ <or>
+ <equals arg1="1.1" arg2="${ant.java.version}"/>
+ <equals arg1="1.2" arg2="${ant.java.version}"/>
+ <equals arg1="1.3" arg2="${ant.java.version}"/>
+ </or>
+ </not>
+ </condition>
+ <fail unless="target.vm">Please use a JVM 1.4 or superior to compile lenya
${version}</fail>
<property name="packages" value="*.*"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
