Skip to content

Commit 7eb484a

Browse files
committed
bat / sh scripts rewritten
1 parent 93d66e9 commit 7eb484a

40 files changed

Lines changed: 442 additions & 404 deletions

jmmc-tools/bin/env.bat

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@ECHO OFF
2+
3+
REM Windows batch file
4+
REM
5+
REM Set general JVM settings
6+
REM
7+
8+
REM Set location of all-in-one jar file:
9+
SET DIR=.
10+
11+
REM Add JVM options (heap):
12+
SET JAVA_OPTS=-Xms1024m -Xmx4096m %JAVA_OPTS%
13+
14+
REM Define custom JDK (optional):
15+
REM SET JAVA_HOME=C:\jdk8u352-b08
16+
REM SET PATH=%JAVA_HOME%\bin\;%PATH%
17+
18+
echo "Java version:"
19+
java -version
20+
21+
REM --- EoF ---
22+

jmmc-tools/bin/env.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
#!/bin/bash
2+
3+
# Unix script file
4+
#
5+
# Set general JVM settings
6+
#
7+
8+
# Set location of all-in-one jar file:
9+
export DIR=.
10+
11+
# Add JVM options (heap):
12+
export JAVA_OPTS="-Xms1024m -Xmx4096m ${JAVA_OPTS}"
13+
14+
# Define custom JDK (optional):
15+
# export JAVA_HOME=~/jdk8u352-b08
16+
# export PATH=${JAVA_HOME}/bin/:$PATH
17+
18+
echo "Java version:"
19+
java -version
20+
21+
# --- EoF ---
22+
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
@ECHO OFF
2+
3+
REM Windows batch file
4+
REM
5+
REM Run AppLauncher
6+
REM
7+
8+
# set main class:
9+
CLASS=fr.jmmc.smprun.AppLauncher
10+
11+
CALL run_jmmc.bat
12+
Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
#!/bin/bash
2+
3+
# Unix script file
24
#
3-
# GUI AppLauncher
5+
# Run AppLauncher
46
#
57

68

79
# set main class:
8-
CLASS=fr.jmmc.smprun.AppLauncher
9-
10-
DIR="."
11-
12-
# --- template-start ---
13-
# jdk17+: add "--illegal-access=permit"
14-
JAVA_OPTS="-Xms512m -Xmx4g $JAVA_OPTS"
15-
16-
echo "Java version:"
17-
java -version
18-
19-
echo "JAVA_OPTS: '$JAVA_OPTS'"
20-
echo "JAVA_TUNING: '$JAVA_TUNING'"
10+
export CLASS=fr.jmmc.smprun.AppLauncher
2111

22-
java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" $CLASS "$@"
12+
bash run_jmmc.sh
2313

24-
# --- template-end ---
14+
# --- EoF ---
2515

jmmc-tools/bin/run_Aspro2-gui.bat

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,15 @@
1+
@ECHO OFF
2+
13
REM Windows batch file
24
REM
3-
REM GUI Aspro2
5+
REM Run Aspro2
46
REM
57

68
REM enable/disable BB models :
7-
REM SET JAVA_OPTS="-Djmal.bb=false"
9+
REM SET JAVA_OPTS=-Djmal.bb=false
810

911
REM set main class:
1012
SET CLASS=fr.jmmc.aspro.Aspro2
1113

12-
SET DIR="."
13-
14-
REM --- template-start ---
15-
REM jdk17+: add "--illegal-access=permit"
16-
SET JAVA_OPTS="-Xms512m -Xmx4g %JAVA_OPTS%"
17-
18-
echo "Java version:"
19-
java -version
20-
21-
echo "JAVA_OPTS: '%JAVA_OPTS%'"
22-
echo "JAVA_TUNING: '%JAVA_TUNING%'"
23-
24-
java %JAVA_TUNING% %JAVA_OPTS% -cp %DIR%\jmmc-tools-TRUNK-jar-with-dependencies.jar %CLASS% %*
25-
26-
REM --- template-end ---
14+
CALL run_jmmc.bat
2715

jmmc-tools/bin/run_Aspro2-gui.sh

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
11
#!/bin/bash
2+
3+
# Unix script file
24
#
3-
# GUI Aspro2
5+
# Run Aspro2
46
#
57

68
# enable/disable BB models :
7-
#export JAVA_OPTS="-Djmal.bb=false"
9+
# export JAVA_OPTS=-Djmal.bb=false
810

911
# set main class:
10-
CLASS=fr.jmmc.aspro.Aspro2
11-
12-
DIR="."
13-
14-
# --- template-start ---
15-
# jdk17+: add "--illegal-access=permit"
16-
JAVA_OPTS="-Xms512m -Xmx4g $JAVA_OPTS"
17-
18-
echo "Java version:"
19-
java -version
20-
21-
echo "JAVA_OPTS: '$JAVA_OPTS'"
22-
echo "JAVA_TUNING: '$JAVA_TUNING'"
12+
export CLASS=fr.jmmc.aspro.Aspro2
2313

24-
java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" $CLASS "$@"
14+
bash run_jmmc.sh
2515

26-
# --- template-end ---
16+
# --- EoF ---
2717

jmmc-tools/bin/run_LITpro-gui.bat

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
1+
@ECHO OFF
2+
13
REM Windows batch file
24
REM
3-
REM GUI LITpro
5+
REM Run LITpro
46
REM
57

6-
78
REM set main class:
89
SET CLASS=fr.jmmc.mf.LITpro
910

10-
SET DIR="."
11-
12-
REM --- template-start ---
13-
REM jdk17+: add "--illegal-access=permit"
14-
SET JAVA_OPTS="-Xms512m -Xmx4g %JAVA_OPTS%"
15-
16-
echo "Java version:"
17-
java -version
18-
19-
echo "JAVA_OPTS: '%JAVA_OPTS%'"
20-
echo "JAVA_TUNING: '%JAVA_TUNING%'"
21-
22-
java %JAVA_TUNING% %JAVA_OPTS% -cp %DIR%\jmmc-tools-TRUNK-jar-with-dependencies.jar %CLASS% %*
23-
24-
REM --- template-end ---
11+
CALL run_jmmc.bat
2512

jmmc-tools/bin/run_LITpro-gui.sh

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
#!/bin/bash
2+
3+
# Unix script file
24
#
3-
# GUI LITpro
5+
# Run LITpro
46
#
57

6-
78
# set main class:
8-
CLASS=fr.jmmc.mf.LITpro
9-
10-
DIR="."
11-
12-
# --- template-start ---
13-
# jdk17+: add "--illegal-access=permit"
14-
JAVA_OPTS="-Xms512m -Xmx4g $JAVA_OPTS"
15-
16-
echo "Java version:"
17-
java -version
18-
19-
echo "JAVA_OPTS: '$JAVA_OPTS'"
20-
echo "JAVA_TUNING: '$JAVA_TUNING'"
9+
export CLASS=fr.jmmc.mf.LITpro
2110

22-
java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" $CLASS "$@"
11+
bash run_jmmc.sh
2312

24-
# --- template-end ---
13+
# --- EoF ---
2514

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,12 @@
1+
@ECHO OFF
2+
13
REM Windows batch file
24
REM
3-
REM GUI OIFitsExplorer
5+
REM Run OIFitsExplorer
46
REM
57

6-
78
REM set main class:
89
SET CLASS=fr.jmmc.oiexplorer.OIFitsExplorer
910

10-
SET DIR="."
11-
12-
REM --- template-start ---
13-
REM jdk17+: add "--illegal-access=permit"
14-
SET JAVA_OPTS="-Xms512m -Xmx4g %JAVA_OPTS%"
15-
16-
echo "Java version:"
17-
java -version
18-
19-
echo "JAVA_OPTS: '%JAVA_OPTS%'"
20-
echo "JAVA_TUNING: '%JAVA_TUNING%'"
21-
22-
java %JAVA_TUNING% %JAVA_OPTS% -cp %DIR%\jmmc-tools-TRUNK-jar-with-dependencies.jar %CLASS% %*
23-
24-
REM --- template-end ---
11+
CALL run_jmmc.bat
2512

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
#!/bin/bash
2+
3+
# Unix script file
24
#
3-
# GUI OIFitsExplorer
5+
# Run OIFitsExplorer
46
#
57

6-
78
# set main class:
8-
CLASS=fr.jmmc.oiexplorer.OIFitsExplorer
9-
10-
DIR="."
11-
12-
# --- template-start ---
13-
# jdk17+: add "--illegal-access=permit"
14-
JAVA_OPTS="-Xms512m -Xmx4g $JAVA_OPTS"
15-
16-
echo "Java version:"
17-
java -version
18-
19-
echo "JAVA_OPTS: '$JAVA_OPTS'"
20-
echo "JAVA_TUNING: '$JAVA_TUNING'"
9+
export CLASS=fr.jmmc.oiexplorer.OIFitsExplorer
2110

22-
java $JAVA_TUNING $JAVA_OPTS -cp "$DIR/jmmc-tools-TRUNK-jar-with-dependencies.jar" $CLASS "$@"
11+
bash run_jmmc.sh
2312

24-
# --- template-end ---
13+
# --- EoF ---
2514

0 commit comments

Comments
 (0)