Skip to content

Commit 7dc6b59

Browse files
moovidamoovida
committed
hopefully fixing spaces in path issues on windows for good + adding higher xss for stackoverflows happening on pitfiller in super large flat areas
1 parent 671091f commit 7dc6b59

28 files changed

Lines changed: 58 additions & 52 deletions

‎extras/deploy/hm-dbviewer.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ IF EXIST "%~dp0\jre\bin\java.exe" (
2424
)
2525

2626
set MEM="-Xmx2g"
27+
set XSS="-Xss64m"
2728
set PATH=%~dp0\natives\;%PATH%
28-
"%JAVAEXE%" -splash:%~dp0\imgs\splash_dbviewer.png %MEM% -Djava.util.logging.config.file=.\quiet-logging.properties -Djava.library.path=%~dp0\natives\ -cp ".\libs\*" org.hortonmachine.database.DatabaseViewer %1
29+
"%JAVAEXE%" -splash:"%~dp0\imgs\splash_dbviewer.png" %MEM% %XSS% -Djava.util.logging.config.file=.\quiet-logging.properties -Djava.library.path="%~dp0\natives" -cp ".\libs\*" org.hortonmachine.database.DatabaseViewer %1
2930

3031
endlocal

‎extras/deploy/hm-dbviewer.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#
1919

20-
MEM="-Xmx4g"
20+
MEM="-Xmx4g -Xss64m"
2121

2222
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
23-
DIR=`dirname "$0"`
2423

2524
if [ -f "$DIR/jre/bin/java" ]; then
2625
JAVAEXE=$DIR/jre/bin/java
2726
else
2827
JAVAEXE=java
2928
fi
3029

31-
"$JAVAEXE" -splash:$DIR/imgs/splash_dbviewer.png $MEM -Djava.util.logging.config.file=$DIR/quiet-logging.properties -Djava.library.path=$DIR/natives/ -cp "$DIR/libs/*" org.hortonmachine.database.DatabaseViewer $1
30+
"$JAVAEXE" -splash:"$DIR/imgs/splash_dbviewer.png" $MEM -Djava.util.logging.config.file="$DIR/quiet-logging.properties" -Djava.library.path="$DIR/natives/" -cp "$DIR/libs/*" org.hortonmachine.database.DatabaseViewer "$1"

‎extras/deploy/hm-geopaparazzi_viewer.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ IF EXIST "%~dp0\jre\bin\java.exe" (
2424
)
2525

2626
set MEM="-Xmx2g"
27-
"%JAVAEXE%" -splash:%~dp0\imgs\splash_geopaparazziviewer.png %MEM% -Djava.util.logging.config.file=.\quiet-logging.properties -Djava.library.path=.\natives\ -cp ".\libs\*" org.hortonmachine.geopaparazzi.GeopaparazziViewer
27+
set XSS="-Xss64m"
28+
"%JAVAEXE%" -splash:"%~dp0\imgs\splash_geopaparazziviewer.png" %MEM% %XSS% -Djava.util.logging.config.file=.\quiet-logging.properties -Djava.library.path=.\natives\ -cp ".\libs\*" org.hortonmachine.geopaparazzi.GeopaparazziViewer
2829

2930
endlocal

‎extras/deploy/hm-geopaparazzi_viewer.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#
1919

20-
MEM="-Xmx2g"
20+
MEM="-Xmx2g -Xss64m"
2121

2222
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2323

24-
2524
if [ -f "$DIR/jre/bin/java" ]; then
2625
JAVAEXE=$DIR/jre/bin/java
2726
else
2827
JAVAEXE=java
2928
fi
3029

31-
"$JAVAEXE" -splash:$DIR/imgs/splash_geopaparazziviewer.png $MEM -Djava.library.path=$DIR/natives/ -cp "$DIR/libs/*" org.hortonmachine.geopaparazzi.GeopaparazziViewer
30+
"$JAVAEXE" -splash:"$DIR/imgs/splash_geopaparazziviewer.png" $MEM -Djava.library.path="$DIR/natives/" -cp "$DIR/libs/*" org.hortonmachine.geopaparazzi.GeopaparazziViewer

‎extras/deploy/hm-geoscript.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ IF [%1]==[] (
3030
:startit
3131

3232
set MEM=-Xmx2g
33+
set XSS=-Xss64m
3334
set PATH=%~dp0\natives\;%PATH%
34-
%JAVAEXE% %SPLASH% %MEM% -Djava.util.logging.config.file=.\quiet-logging.properties -Djava.library.path="%~dp0\natives" -cp "%~dp0\libs\*" org.hortonmachine.geoscript.GeoscriptConsole %1
35+
%JAVAEXE% %SPLASH% %MEM% %XSS% -Djava.util.logging.config.file=.\quiet-logging.properties -Djava.library.path="%~dp0\natives" -cp "%~dp0\libs\*" org.hortonmachine.geoscript.GeoscriptConsole %1
3536

3637
endlocal

‎extras/deploy/hm-geoscript.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#
1919

20-
MEM="-Xmx4g"
20+
MEM="-Xmx4g -Xss64m"
2121

2222
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2323

2424
SPLASH=""
2525
if [ -z "$1" ]
26-
then
27-
SPLASH=-splash:$DIR/imgs/splash_geoscript.png
26+
then
27+
SPLASH="-splash:$DIR/imgs/splash_geoscript.png"
2828
fi
2929

3030
if [ -f "$DIR/jre/bin/java" ]; then
@@ -34,4 +34,4 @@ else
3434
fi
3535

3636

37-
"$JAVAEXE" $SPLASH $MEM -Djava.util.logging.config.file=$DIR/quiet-logging.properties -cp "$DIR/libs/*" org.hortonmachine.geoscript.GeoscriptConsole $1
37+
"$JAVAEXE" ${SPLASH:+"$SPLASH"} $MEM -Djava.util.logging.config.file="$DIR/quiet-logging.properties" -cp "$DIR/libs/*" org.hortonmachine.geoscript.GeoscriptConsole "$1"

‎extras/deploy/hm-gforms.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ IF EXIST "%~dp0\jre\bin\java.exe" (
2323
)
2424

2525
set MEM="-Xmx256m"
26-
"%JAVAEXE%" -splash:%~dp0\imgs\splash_gforms.png %MEM% -Djava.util.logging.config.file=.\quiet-logging.properties -cp ".\libs\*" org.hortonmachine.gforms.FormBuilderController %1
26+
set XSS="-Xss64m"
27+
"%JAVAEXE%" -splash:"%~dp0\imgs\splash_gforms.png" %MEM% %XSS% -Djava.util.logging.config.file=.\quiet-logging.properties -cp ".\libs\*" org.hortonmachine.gforms.FormBuilderController %1
2728

2829
endlocal

‎extras/deploy/hm-gforms.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@
1616
# You should have received a copy of the GNU General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#
19-
MEM="-Xmx256m"
19+
MEM="-Xmx256m -Xss64m"
2020

2121
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
22-
DIR=`dirname "$0"`
2322
if [ -f "$DIR/jre/bin/java" ]; then
2423
JAVAEXE=$DIR/jre/bin/java
2524
else
2625
JAVAEXE=java
2726
fi
2827

2928

30-
"$JAVAEXE" -splash:$DIR/imgs/splash_gforms.png $MEM -Djava.util.logging.config.file=$DIR/quiet-logging.properties -cp "$DIR/libs/*" org.hortonmachine.gforms.FormBuilderController $1
29+
"$JAVAEXE" -splash:"$DIR/imgs/splash_gforms.png" $MEM -Djava.util.logging.config.file="$DIR/quiet-logging.properties" -cp "$DIR/libs/*" org.hortonmachine.gforms.FormBuilderController "$1"

‎extras/deploy/hm-h2gis-server-start.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#
1919

20-
MEM="-Xmx4g"
20+
MEM="-Xmx4g -Xss64m"
2121

2222
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2323

@@ -31,4 +31,4 @@ else
3131
fi
3232

3333

34-
"$JAVAEXE" $MEM -Djava.library.path=$DIR/natives/ -cp "$DIR/libs/*" org.hortonmachine.dbs.h2gis.H2GisServer $1 $2
34+
"$JAVAEXE" $MEM -Djava.library.path="$DIR/natives/" -cp "$DIR/libs/*" org.hortonmachine.dbs.h2gis.H2GisServer "$1" "$2"

‎extras/deploy/hm-h2gis-tcpserver-stop.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
#
1919

20-
MEM="-Xmx4g"
20+
MEM="-Xmx4g -Xss64m"
2121

2222
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2323

@@ -29,4 +29,4 @@ else
2929
fi
3030

3131

32-
"$JAVAEXE" $MEM -Djava.library.path=$DIR/natives/ -cp "$DIR/libs/*" org.h2.tools.Server -tcpShutdown tcp://localhost:$1
32+
"$JAVAEXE" $MEM -Djava.library.path="$DIR/natives/" -cp "$DIR/libs/*" org.h2.tools.Server -tcpShutdown "tcp://localhost:$1"

0 commit comments

Comments
 (0)