From 860172f751ad52cd98828335079bc1179e684504 Mon Sep 17 00:00:00 2001 From: Stefano Mazzocchi Date: Tue, 4 May 2010 23:41:57 +0000 Subject: [PATCH] - set native eol properties for the startup scripts for unix and win - add a whitespace normalizing command to the gridworks script git-svn-id: http://google-refine.googlecode.com/svn/trunk@595 7d457c2a-affb-35e4-300a-418c747d4874 --- LICENSE.txt | 2 +- gridworks | 18 +++ gridworks.bat | 304 +++++++++++++++++++++++++------------------------- 3 files changed, 171 insertions(+), 153 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index b84cbde1d..4acc3fdd0 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -111,4 +111,4 @@ Others ------ Flag icon - http://pixel-mixer.com/category/free-icons/ \ No newline at end of file + http://pixel-mixer.com/category/free-icons/ diff --git a/gridworks b/gridworks index ac4f43ddd..4bdf70f0e 100755 --- a/gridworks +++ b/gridworks @@ -66,6 +66,8 @@ and is one of pmd ....................... Run PMD against Gridworks cpd ....................... Run Copy/Paste Detection against Gridworks jslint .................... Run JSlint against Gridworks + + whitespace .... Normalize whitespace in files with the given extension mac_dist ........ Make MacOSX binary distribution windows_dist .... Make Windows binary distribution @@ -633,6 +635,21 @@ jslint() { open "$GRIDWORKS_BUILD_DIR/reports/jslint.txt" } +whitespace() { + [ $# -gt 0 ] || usage + + for i in `find . -name *.$1`; do + # expand tabs to spaces + expand -t 4 < $i > $i.1 + + # convert DOS to UNIX newlines + tr -d '\r' < $i.1 > $i.2 + + rm $i $i.1 + mv $i.2 $i + done +} + # -------------------------- script ----------------------------- # ----- Normalize the current directory ------------------------- @@ -779,6 +796,7 @@ add_option "-Dpython.path=$JYTHONPATH" case "$ACTION" in build) build_prepare; ant build;; clean) ant clean;; + whitespace) whitespace $1;; distclean) ant distclean;; test) test $1;; tests) test $1;; diff --git a/gridworks.bat b/gridworks.bat index 36075496f..7d4e9b000 100644 --- a/gridworks.bat +++ b/gridworks.bat @@ -1,171 +1,171 @@ -@echo off -rem -rem Configuration variables -rem -rem JAVA_HOME -rem Home of Java installation. -rem -rem JAVA_OPTIONS -rem Extra options to pass to the JVM +@echo off rem - -if "%OS%"=="Windows_NT" @setlocal -if "%OS%"=="WINNT" @setlocal - -rem --- First two utilities for exiting -------------------------------------------- - -goto endUtils - -:usage -echo Usage %0 [options] ^ -echo where [options] include: -echo. -echo /h print this message and exit -echo. -echo /p the port that Gridworks will listen to -echo default: 3333 -echo. -echo /i the host interface gridworks should bind to -echo default: 127.0.0.1 -echo. -echo /w path to the webapp -echo default src\main\webapp -echo. +rem Configuration variables +rem +rem JAVA_HOME +rem Home of Java installation. +rem +rem JAVA_OPTIONS +rem Extra options to pass to the JVM +rem + +if "%OS%"=="Windows_NT" @setlocal +if "%OS%"=="WINNT" @setlocal + +rem --- First two utilities for exiting -------------------------------------------- + +goto endUtils + +:usage +echo Usage %0 [options] ^ +echo where [options] include: +echo. +echo /h print this message and exit +echo. +echo /p the port that Gridworks will listen to +echo default: 3333 +echo. +echo /i the host interface gridworks should bind to +echo default: 127.0.0.1 +echo. +echo /w path to the webapp +echo default src\main\webapp +echo. echo /d enable JVM debugging (on port 8000) echo. echo /m max memory heap size to use -echo default: 1024M -echo. -echo /x enable JMX monitoring (for jconsole and friends) -echo. -echo and is one of -echo. -echo build ..................... Build Gridworks -echo run ....................... Run Gridworks +echo default: 1024M echo. -echo clean ..................... Clean compiled classes -echo distclean ................. Remove all generated files -echo. -goto end - -:fail -echo Type 'gridworks /h' for usage. -goto end - -:endUtils - -if not "%JAVA_HOME%" == "" goto gotJavaHome +echo /x enable JMX monitoring (for jconsole and friends) +echo. +echo and is one of +echo. +echo build ..................... Build Gridworks +echo run ....................... Run Gridworks +echo. +echo clean ..................... Clean compiled classes +echo distclean ................. Remove all generated files +echo. +goto end + +:fail +echo Type 'gridworks /h' for usage. +goto end + +:endUtils + +if not "%JAVA_HOME%" == "" goto gotJavaHome echo You must set JAVA_HOME to point at your Java Development Kit installation echo. echo If you don't know how to do this, follow the instructions at echo. echo http://bit.ly/1c2gkR echo. - -goto fail -:gotJavaHome -rem --- Read ini file -------------------------------------------- +goto fail +:gotJavaHome -set OPTS= +rem --- Read ini file -------------------------------------------- + +set OPTS= for /f "tokens=1,2 delims==" %%a in (gridworks.ini) do ( set %%a=%%b ) - -rem --- Argument parsing -------------------------------------------- - -:loop -if ""%1"" == """" goto endArgumentParsing -if ""%1"" == ""/h"" goto usage -if ""%1"" == ""/p"" goto arg-p -if ""%1"" == ""/i"" goto arg-i -if ""%1"" == ""/w"" goto arg-w -if ""%1"" == ""/d"" goto arg-d -if ""%1"" == ""/m"" goto arg-m -if ""%1"" == ""/x"" goto arg-x -goto endArgumentParsing - -:arg-p -set GRIDWORKS_PORT=%2 -goto shift2loop - -:arg-i -set GRIDWORKS_HOST=%2 -goto shift2loop - -:arg-w -set GRIDWORKS_WEBAPP=%2 -goto shift2loop -:arg-m -set GRIDWORKS_MEMORY=%2 -goto shift2loop - -:arg-d -set OPTS=%OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -goto shift2loop - -:arg-x -set OPTS=%OPTS% -Dcom.sun.management.jmxremote -goto shift2loop - -:shift2loop -shift -shift -goto loop - -:endArgumentParsing - -rem --- Fold in Environment Vars -------------------------------------------- - -if not "%JAVA_OPTIONS%" == "" goto gotJavaOptions -set JAVA_OPTIONS= -:gotJavaOptions -set OPTS=%OPTS% %JAVA_OPTIONS% +rem --- Argument parsing -------------------------------------------- -if not "%GRIDWORKS_MEMORY%" == "" goto gotMemory -set GRIDWORKS_MEMORY=1024M -:gotMemory -set OPTS=%OPTS% -Xms256M -Xmx%GRIDWORKS_MEMORY% - -if not "%GRIDWORKS_PORT%" == "" goto gotPort -set GRIDWORKS_PORT=3333 -:gotPort -set OPTS=%OPTS% -Dgridworks.port=%GRIDWORKS_PORT% - -if not "%GRIDWORKS_HOST%" == "" goto gotHost -set GRIDWORKS_HOST=127.0.0.1 -:gotHOST -set OPTS=%OPTS% -Dgridworks.host=%GRIDWORKS_HOST% - -if not "%GRIDWORKS_WEBAPP%" == "" goto gotHost -set GRIDWORKS_WEBAPP=src\main\webapp -:gotHOST -set OPTS=%OPTS% -Dgridworks.webapp=%GRIDWORKS_WEBAPP% - -if not "%GRIDWORKS_BUILD_DIR%" == "" goto gotBuildDir -set GRIDWORKS_BUILD_DIR=build -:gotBuildDir - -if not "%GRIDWORKS_LIB_DIR%" == "" goto gotLibDir -set GRIDWORKS_LIB_DIR=lib -:gotLibDir - -rem ----- Respond to the action ---------------------------------------------------------- - -set ACTION=%1 - -if ""%ACTION%"" == ""build"" goto doAnt -if ""%ACTION%"" == ""clean"" goto doAnt -if ""%ACTION%"" == ""distclean"" goto doAnt -if ""%ACTION%"" == ""run"" goto doRun - -:doRun +:loop +if ""%1"" == """" goto endArgumentParsing +if ""%1"" == ""/h"" goto usage +if ""%1"" == ""/p"" goto arg-p +if ""%1"" == ""/i"" goto arg-i +if ""%1"" == ""/w"" goto arg-w +if ""%1"" == ""/d"" goto arg-d +if ""%1"" == ""/m"" goto arg-m +if ""%1"" == ""/x"" goto arg-x +goto endArgumentParsing + +:arg-p +set GRIDWORKS_PORT=%2 +goto shift2loop + +:arg-i +set GRIDWORKS_HOST=%2 +goto shift2loop + +:arg-w +set GRIDWORKS_WEBAPP=%2 +goto shift2loop + +:arg-m +set GRIDWORKS_MEMORY=%2 +goto shift2loop + +:arg-d +set OPTS=%OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n +goto shift2loop + +:arg-x +set OPTS=%OPTS% -Dcom.sun.management.jmxremote +goto shift2loop + +:shift2loop +shift +shift +goto loop + +:endArgumentParsing + +rem --- Fold in Environment Vars -------------------------------------------- + +if not "%JAVA_OPTIONS%" == "" goto gotJavaOptions +set JAVA_OPTIONS= +:gotJavaOptions +set OPTS=%OPTS% %JAVA_OPTIONS% + +if not "%GRIDWORKS_MEMORY%" == "" goto gotMemory +set GRIDWORKS_MEMORY=1024M +:gotMemory +set OPTS=%OPTS% -Xms256M -Xmx%GRIDWORKS_MEMORY% + +if not "%GRIDWORKS_PORT%" == "" goto gotPort +set GRIDWORKS_PORT=3333 +:gotPort +set OPTS=%OPTS% -Dgridworks.port=%GRIDWORKS_PORT% + +if not "%GRIDWORKS_HOST%" == "" goto gotHost +set GRIDWORKS_HOST=127.0.0.1 +:gotHOST +set OPTS=%OPTS% -Dgridworks.host=%GRIDWORKS_HOST% + +if not "%GRIDWORKS_WEBAPP%" == "" goto gotHost +set GRIDWORKS_WEBAPP=src\main\webapp +:gotHOST +set OPTS=%OPTS% -Dgridworks.webapp=%GRIDWORKS_WEBAPP% + +if not "%GRIDWORKS_BUILD_DIR%" == "" goto gotBuildDir +set GRIDWORKS_BUILD_DIR=build +:gotBuildDir + +if not "%GRIDWORKS_LIB_DIR%" == "" goto gotLibDir +set GRIDWORKS_LIB_DIR=lib +:gotLibDir + +rem ----- Respond to the action ---------------------------------------------------------- + +set ACTION=%1 + +if ""%ACTION%"" == ""build"" goto doAnt +if ""%ACTION%"" == ""clean"" goto doAnt +if ""%ACTION%"" == ""distclean"" goto doAnt +if ""%ACTION%"" == ""run"" goto doRun + +:doRun set CLASSPATH="%GRIDWORKS_BUILD_DIR%\classes;%GRIDWORKS_LIB_DIR%\*" -"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=lib/native/windows com.metaweb.gridworks.Gridworks -goto end - +"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=lib/native/windows com.metaweb.gridworks.Gridworks +goto end + :doAnt if not "%ANT_HOME%" == "" goto gotAntHome echo You must have Apache Ant installed and the ANT_HOME environment variable to point to it @@ -179,7 +179,7 @@ echo. echo http://bit.ly/1c2gkR echo. :gotAntHome -"%ANT_HOME%\bin\ant.bat" -f build.xml -Dbuild.dir="%GRIDWORKS_BUILD_DIR%" %ACTION% -goto end - -:end +"%ANT_HOME%\bin\ant.bat" -f build.xml -Dbuild.dir="%GRIDWORKS_BUILD_DIR%" %ACTION% +goto end + +:end