From 85a3cd4dbeb1eb88c0ce13b937b406740a855e0d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marko=20Gr=C3=B6nroos?= <magi@iki.fi>
Date: Fri, 13 Jun 2008 14:35:41 +0000
Subject: [PATCH] Fixes #1608 further. Removed old client-side compile scripts.
 Fixed problem in compiling installation package.

svn changeset:4870/svn branch:trunk
---
 build/bin/compile-gwt-components     | 39 ----------------------------
 build/bin/compile-gwt-components.bat |  2 --
 build/build.xml                      |  3 ++-
 3 files changed, 2 insertions(+), 42 deletions(-)
 delete mode 100755 build/bin/compile-gwt-components
 delete mode 100644 build/bin/compile-gwt-components.bat

diff --git a/build/bin/compile-gwt-components b/build/bin/compile-gwt-components
deleted file mode 100755
index 6095f1c511..0000000000
--- a/build/bin/compile-gwt-components
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Check that the script is only run in build/bin
-if [ ! -e compile-gwt-components ]; then
-echo compile-gwt-components must only be run from build/bin directory
-exit
-fi
-
-# Parameters
-JVMVARS="-Xmx512M"
-
-# Detect platform
-PLATFORM=""
-if [ -d "/Users" ]
-then
-    echo "MAC OS"
-    PLATFORM="mac"
-    # Do not add this command for 10.5
-	 if (uname -v | grep -v -q 9.0); then 
-	    JVMVARS="$JVMVARS -XstartOnFirstThread"
-     fi
-else
-	PLATFORM="linux"
-fi
-
-
-OUTDIR=../../WebContent/ITMILL/widgetsets
-GWTDIR=../gwt/gwt
-SRCDIR=../../src
-STYLE=OBF
-
-# Clean anything that could be wrong
-rm -r $OUTDIR/*
-rm -r .gwt-cache
-
-# Build the widgetsets
-java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out $OUTDIR com.itmill.toolkit.terminal.gwt.DefaultWidgetSet -style $STYLE
-java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" com.itmill.toolkit.demo.colorpicker.gwt.ColorPickerWidgetSet -style $STYLE
-java $JVMVARS -cp "$SRCDIR:$GWTDIR/gwt-user.jar:../../lib/reservr/googlemaps_gwt.jar:$GWTDIR/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent/ITMILL/widgetsets" com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet -style $STYLE
diff --git a/build/bin/compile-gwt-components.bat b/build/bin/compile-gwt-components.bat
deleted file mode 100644
index 7967d9fde9..0000000000
--- a/build/bin/compile-gwt-components.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-@java -Xmx128m -Xms128m -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.terminal.gwt.DefaultWidgetSet
-@java -Xmx128m -Xms128m -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../../lib/reservr/googlemaps_gwt.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent/ITMILL/widgetsets" %* com.itmill.toolkit.demo.reservation.gwt.ReservationWidgetSet
\ No newline at end of file
diff --git a/build/build.xml b/build/build.xml
index 91df4d7de1..07790653e5 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -105,7 +105,7 @@
 	</target>
 	
 	<!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
-	<target name="init">
+	<target name="init" depends="init-platform">
 
 		<property file="build/build.properties" />
 		<property file="build/VERSION.properties" />
@@ -688,6 +688,7 @@
 
 	<!-- Builds the client-side engine, i.e., the widgetsets in parallel. -->
 	<target name="compile-client-side">
+		<echo>Compiling widget sets in parallel.</echo>
 		<parallel threadsperprocessor="1">
 	        <subant antfile="build.xml" target="compile-widgetset-default" inheritall="true" buildpath="build"/>
             <subant antfile="build.xml" target="compile-widgetset-reserver" inheritall="true" buildpath="build"/> 
-- 
2.39.5