Dev: Fix bootstrapping issues and bad echoes [#427]

res/dev/make/maven/xowa_maven_boot.sh

@@ -6,16 +6,26 @@ export root=c:/xowa_dev
 
 # java settings should match your machine
 export jdk=1.7
-export JAVA_HOME=C:/000/100_bin/100_os/200_runtime/100_java/100_jdk_1_8_x64
+export JAVA_HOME=C:/xowa_dev/bin/java/jdk_1_8_x64
 
 # directories should be set to whatever exists on your machine
-export ant=C:/000/100_bin/500_dev/110_java/200_apache_ant/bin/ant
-export mvn=C:/000/100_bin/500_dev/110_java/210_apache_maven/bin/mvn
+export ant=C:/xowa_dev/bin/apache_ant/bin/ant
+export mvn=C:/xowa_dev/bin/apache_maven/bin/mvn
 
 # set "verbose=y" or "verbose="
 export verbose=
 
+echo '* XOWA: downloading latest xowa'
+cd $root
+rm -rf ./src
+mkdir src
+cd src
+git clone https://github.com/gnosygnu/xowa.git
+cd ..
+
+echo '* XOWA: copying maven files to root'
+cp -rf ./src/xowa/res/dev/make/maven/* ./
+
 # run other shell scripts
-sh xowa_maven_download.sh
 sh xowa_maven_files.sh
 sh xowa_maven_mvn.sh

res/dev/make/maven/xowa_maven_download.sh

@@ -1,20 +0,0 @@
-echo * XOWA: downloading latest xowa
-cd $root
-rm -rf ./src
-mkdir src
-cd src
-git clone https://github.com/gnosygnu/xowa.git
-cd ..
-
-echo * XOWA: regen xowa_maven root
-rm -rf ./src/xowa_maven
-mkdir -p ./src/xowa_maven
-
-echo * XOWA: copying maven files to root
-cp -rf ./src/xowa/res/dev/make/maven/*.xowa_maven_download.sh  ./
-cp -rf ./src/xowa/res/dev/make/maven/*.xowa_maven_files.sh     ./
-cp -rf ./src/xowa/res/dev/make/maven/*.xowa_maven_mvn.sh       ./
-cp -rf ./src/xowa/res/dev/make/maven/*.txt ./
-
-echo * XOWA: copying maven pom.xml and build.xml
-cp -rf ./src/xowa/res/dev/make/maven/*.xml ./src/xowa_maven

res/dev/make/maven/xowa_maven_files.sh

@@ -1,18 +1,26 @@
-echo * XOWA: copy res to xowa_maven
+echo "* XOWA: regen xowa_maven root"
+rm -rf ./src/xowa_maven
+mkdir -p ./src/xowa_maven
+
+echo "* XOWA: copying maven pom.xml and build.xml"
+cp -rf ./pom.xml ./src/xowa_maven/
+cp -rf ./build.xml ./src/xowa_maven/
+
+echo "* XOWA: copy res to xowa_maven"
 cp -R$verbose ./src/xowa/res             ./src/xowa_maven
 
-echo * XOWA: copy user / bin to runtime locations
+echo "* XOWA: copy user / bin to runtime locations"
 cp -R$verbose ./src/xowa_maven/res/user  ./src/xowa_maven
 cp -R$verbose ./src/xowa_maven/res/bin   ./src/xowa_maven
 
-echo * XOWA: prepare source directories
+echo "* XOWA: prepare source directories"
 mkdir -p ./src/xowa_maven/src/main/java/gplx
 mkdir -p ./src/xowa_maven/src/test/java/gplx
 
-echo * XOWA: create mavenize_xowa function
+echo "* XOWA: create mavenize_xowa function"
 mavenize_xowa () 
 {
-  echo * XOWA: mavenizing $1
+  echo "* XOWA: mavenizing $1"
   # main <- all non test files
   find $1 -depth -type f      \
     \( ! -name '*_tst.java'   \

res/dev/make/maven/xowa_maven_mvn.sh

@@ -1,7 +1,7 @@
 cd ./src/xowa_maven
 
 # install files from xowa.git to local repo; note that these files aren't in any maven repository
-echo * XOWA: installing non-Maven repo artifacts
+echo "* XOWA: installing non-Maven repo artifacts"
 $mvn install:install-file -Dfile=bin/any/java/jtidy/jtidy_xowa.jar -DgroupId=xowa -DartifactId=jtidy_xowa -Dversion=r938 -Dpackaging=jar
 $mvn install:install-file -Dfile=bin/any/java/luaj/luaj_xowa.jar -DgroupId=xowa -DartifactId=luaj_xowa -Dversion=2.0 -Dpackaging=jar
 $mvn install:install-file -Dfile=bin/any/java/lucene/5.3.0.drd/lucene-analyzers-common-5.3.0-mobile-2.jar -DgroupId=org.apache.lucene -DartifactId=lucene-analyzers-common-mobile -Dversion=5.3.0 -Dpackaging=jar
@@ -13,12 +13,12 @@ $mvn install:install-file -Dfile=bin/any/java/lucene/5.3.0.drd/lucene-queryparse
 $mvn install:install-file -Dfile=bin/any/java/jdbc/sqlite/sqlite-jdbc-3.18.0.jar -DgroupId=xowa -DartifactId=sqllite -Dversion=3.18.0 -Dpackaging=jar
 $mvn install:install-file -Dfile=bin/any/java/vnu/vnu.jar -DgroupId=xowa -DartifactId=validator -Dversion=18.11.5 -Dpackaging=jar
 
-echo * XOWA: running
+echo "* XOWA: running"
 $mvn clean
 $mvn formatter:format
 $mvn compile 
 $mvn -Dtest="gplx.**" test
 $ant -v -buildfile build.xml -Dplat_name=$plat_name
 
-echo * XOWA: launching xowa
+echo "* XOWA: launching xowa"
 java -jar xowa_maven.jar