[Yanel-commits] rev 40919 - public/yanel/trunk
simon at wyona.com
simon at wyona.com
Tue Jan 13 10:46:51 CET 2009
Author: simon
Date: 2009-01-13 10:46:50 +0100 (Tue, 13 Jan 2009)
New Revision: 40919
Modified:
public/yanel/trunk/build.bat
public/yanel/trunk/build.sh
public/yanel/trunk/yanel.bat
public/yanel/trunk/yanel.sh
Log:
removed duplicate script code. see: http://bugzilla.wyona.com/cgi-bin/bugzilla/show_bug.cgi?id=6808 thanks to guillaume
Modified: public/yanel/trunk/build.bat
===================================================================
--- public/yanel/trunk/build.bat 2009-01-13 08:37:45 UTC (rev 40918)
+++ public/yanel/trunk/build.bat 2009-01-13 09:46:50 UTC (rev 40919)
@@ -1,13 +1,2 @@
@echo off
-
-rem ----- Ignore system ANT_HOME variable
-set ORIGINAL_ANT_HOME=%ANT_HOME%
-set ANT_HOME=tools\apache-ant-1.6.5
-
-call %ANT_HOME%\bin\ant -version
-rem call %ANT_HOME%\bin\ant -f src\build\build.xml
-call %ANT_HOME%\bin\ant -f src\build\build.xml -Djava.endorsed.dirs=lib\endorsed -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-rem ----- Restore ANT_HOME
-set ANT_HOME=%ORIGINAL_ANT_HOME%
-set ORIGINAL_ANT_HOME=
+.\yanel.bat build %1 %2 %3 %4 %5 %6 %7 %8 %9
Modified: public/yanel/trunk/build.sh
===================================================================
--- public/yanel/trunk/build.sh 2009-01-13 08:37:45 UTC (rev 40918)
+++ public/yanel/trunk/build.sh 2009-01-13 09:46:50 UTC (rev 40919)
@@ -1,57 +1,2 @@
#!/bin/sh
-
-echo "INFO: Build Yanel ..."
-
-BUILD_SCRIPT_DIR=$PWD
-#BUILD_SCRIPT_DIR=$PWD/`dirname $0`
-
-# ----- Parameters
-
-# ----- Check for JAVA_HOME
-JAVA_HOME="$JAVA_HOME"
-if [ "$JAVA_HOME" = "" ];then
- echo "ERROR: No JAVA_HOME set!"
- echo " Have you installed JDK (Java Development Kit)? If so, then set JAVA_HOME ..."
- echo " MacOS X : Depending on the shell you're using either use"
- echo " setenv JAVA_HOME /System/Library/Frameworks/JavaVM.framework/Home"
- echo " or"
- echo " export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home"
- echo " Linux : export JAVA_HOME=/usr/local/jdk-1.5.0 (whereas '/usr/local/jdk-1.5.0' is just an example path)"
- echo " Windows : Click Start ..."
- exit 1
-fi
-
-# ----- Check for .ant-global.properties
-if [ -f $HOME/.ant-global.properties ];then
- echo "INFO: $HOME/.ant-global.properties exists!"
-else
- echo ""
- echo "WARNING: No $HOME/.ant-global.properties file exists! Setting property 'yanel.home' within .ant-global.properties is optional, but makes development of individual resources and realms much more efficiently!"
- #echo "Press enter/return to continue ..."
- #read answer
- echo ""
-fi
-
-# ----- Check Java version
-# TODO: ....
-
-# ----- Set Environment Variables
-unset ANT_HOME
-ANT_HOME=$BUILD_SCRIPT_DIR/tools/apache-ant-1.6.5
-#echo $ANT_HOME
-
-unset CATALINA_HOME
-
-PATH=$BUILD_SCRIPT_DIR/tools/maven-2.0.4/bin:$ANT_HOME/bin:$PATH
-#echo $PATH
-
-# ----- Build Yanel
-#mvn --version
-ant -version
-# One might want to use the option "-f" for building resources, e.g. "./build.sh -f src/resources/xml/build.xml" instead having to build everything
-if [ "$1" = "-f" ];then
- ant -f $2 $3 -Dyanel.source.home=$BUILD_SCRIPT_DIR
- exit 0
-fi
-# Build everything by default
-ant -f src/build/build.xml "$@"
+./yanel.sh build "$@"
\ No newline at end of file
Modified: public/yanel/trunk/yanel.bat
===================================================================
--- public/yanel/trunk/yanel.bat 2009-01-13 08:37:45 UTC (rev 40918)
+++ public/yanel/trunk/yanel.bat 2009-01-13 09:46:50 UTC (rev 40919)
@@ -17,6 +17,7 @@
if "%1" == "stop"; goto stop
if "%1" == "start-jetty"; goto startJetty
if "%1" == "configure"; goto configure
+if "%1" == "build"; goto build
goto cmdl
:start
@@ -40,6 +41,11 @@
rem %ANT_HOME%\bin\ant -f src\build\build.xml -Djava.endorsed.dirs=lib\endorsed -logger org.apache.tools.ant.NoBannerLogger -emacs config
call %ANT_HOME%\bin\ant -f src/build/build.xml config
goto restoreAntHome
+:build
+ echo "INFO: Building Yanel..."
+ rem call %ANT_HOME%\bin\ant -f src\build\build.xml
+ call %ANT_HOME%\bin\ant -f src\build\build.xml -Djava.endorsed.dirs=lib\endorsed -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9
+ goto restoreAntHome
:cmdl
call %ANT_HOME%\bin\ant -f src/build/build.xml run-yanel-cmdl -Dyanel.path=""
goto restoreAntHome
Modified: public/yanel/trunk/yanel.sh
===================================================================
--- public/yanel/trunk/yanel.sh 2009-01-13 08:37:45 UTC (rev 40918)
+++ public/yanel/trunk/yanel.sh 2009-01-13 09:46:50 UTC (rev 40919)
@@ -1,5 +1,8 @@
#!/bin/sh
+SCRIPT_DIR=$PWD
+#SCRIPT_DIR=$PWD/`dirname $0`
+
# ----- Check for JAVA_HOME
JAVA_HOME="$JAVA_HOME"
if [ "$JAVA_HOME" = "" ];then
@@ -20,12 +23,12 @@
# ----- Set Environment Variables
unset ANT_HOME
-ANT_HOME=$PWD/tools/apache-ant-1.6.5
+ANT_HOME=$SCRIPT_DIR/tools/apache-ant-1.6.5
#echo $ANT_HOME
unset CATALINA_HOME
-PATH=$PWD/tools/maven-2.0.4/bin:$ANT_HOME/bin:$PATH
+PATH=$SCRIPT_DIR/tools/maven-2.0.4/bin:$ANT_HOME/bin:$PATH
#echo $PATH
# ----- Yanel subcommands:
@@ -51,6 +54,30 @@
elif [ "$1" = "configure" ]; then
echo "INFO: Configuring Yanel..."
ant -f src/build/build.xml config
+elif [ "$1" = "build" ]; then
+ echo "INFO: Building Yanel..."
+ shift
+
+# ----- Check for .ant-global.properties
+if [ -f $HOME/.ant-global.properties ];then
+ echo "INFO: $HOME/.ant-global.properties exists!"
else
+ echo ""
+ echo "WARNING: No $HOME/.ant-global.properties file exists! Setting property 'yanel.home' within .ant-global.properties is optional, but makes development of individual resources and realms much more efficiently!"
+ #echo "Press enter/return to continue ..."
+ #read answer
+ echo ""
+fi
+
+# One might want to use the option "-f" for building resources, e.g. "./yanel.sh build -f src/resources/xml/build.xml" instead having to build everything
+#FIXME: this very example seems not to work anymore because properties are initialized too late in the Ant build file (e.g. Maven URL to fetch dependancies), YMMV...
+if [ "$1" = "-f" ];then
+ ant -f $2 $3 -Dyanel.source.home=$SCRIPT_DIR
+ exit 0
+fi
+# Build everything by default
+ant -f src/build/build.xml "$@"
+
+else
ant -f src/build/build.xml run-yanel-cmdl -Dyanel.path=$1
fi
More information about the Yanel-commits
mailing list