Skip to content

Commit 335f2b0

Browse files
author
Bruce Johnson
committed
Change scripts to ringnmrgui
1 parent df888e6 commit 335f2b0

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<modelVersion>4.0.0</modelVersion>
44

55
<groupId>org.comdnmr</groupId>
6-
<artifactId>comdnmrgui</artifactId>
7-
<version>0.99</version>
8-
<name>comdnmrgui</name>
6+
<artifactId>ringnmrgui</artifactId>
7+
<version>1.00</version>
8+
<name>ringnmrgui</name>
99
<packaging>jar</packaging>
1010

1111
<properties>
@@ -16,8 +16,8 @@
1616
<dependencies>
1717
<dependency>
1818
<groupId>org.comdnmr</groupId>
19-
<artifactId>comdnmr</artifactId>
20-
<version>0.99</version>
19+
<artifactId>ringnmr</artifactId>
20+
<version>1.00</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>org.nmrfx</groupId>
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.python</groupId>
3030
<artifactId>jython-standalone</artifactId>
31-
<version>2.7.0</version>
31+
<version>2.7.2</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.controlsfx</groupId>

src/main/assembly/bin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
</fileSets>
4141
<files>
4242
<file>
43-
<source>src/main/scripts/comdnmrgui.bat</source>
43+
<source>src/main/scripts/ringnmrgui.bat</source>
4444
<filtered>true</filtered>
4545
</file>
4646
<file>
47-
<source>src/main/scripts/comdnmrgui</source>
47+
<source>src/main/scripts/ringnmrgui</source>
4848
<filtered>true</filtered>
4949
<fileMode>0744</fileMode>
5050
</file>

src/main/scripts/mkinst.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ do
2525

2626
mkdir -p $dir
2727
cd $dir
28-
cp -r -p ../../target/comdnmrgui-*-bin/comdnmrgui* .
29-
sdir=`ls -d comdnmrgui-*`
28+
cp -r -p ../../target/ringnmrgui-*-bin/ringnmrgui* .
29+
sdir=`ls -d ringnmrgui-*`
3030
cd $sdir
31-
cp -p ../../../../comdnmr/target/comdnmr-*-bin/comdnmr-*/comdnmr .
32-
cp -p ../../../../comdnmr/target/comdnmr-*-bin/comdnmr-*/comdnmr.bat .
31+
cp -p ../../../../comdnmr/target/ringnmr-*-bin/ringnmr-*/ringnmr .
32+
cp -p ../../../../comdnmr/target/ringnmr-*-bin/ringnmr-*/ringnmr.bat .
3333

3434
mkdir jre
3535
cd jre

src/main/scripts/comdnmrgui renamed to src/main/scripts/ringnmrgui

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ CLASSPATH=${dir}"/lib/Manifest.jar"
4444

4545
if [ -d "${dir}/../jre.bundle/Contents/Home/jre/bin" ] ; then
4646
JAVA="${dir}/../jre.bundle/Contents/Home/jre/bin/java"
47-
CLASSPATH="$dir/lib/comdnmrgui-$comdnmrguiver.jar:$CLASSPATH"
47+
CLASSPATH="$dir/lib/ringnmrgui-$comdnmrguiver.jar:$CLASSPATH"
4848
elif [ -d "${dir}/jre/bin" ] ; then
4949
JAVA="${dir}/jre/bin/java"
50-
CLASSPATH="$dir/lib/comdnmrgui-$comdnmrguiver.jar:$CLASSPATH"
50+
CLASSPATH="$dir/lib/ringnmrgui-$comdnmrguiver.jar:$CLASSPATH"
5151
else
5252
if [ -n "$JAVA_HOME" ] ; then
5353
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -60,13 +60,13 @@ else
6060

6161
if $ismsys ; then
6262
comdnmrguidir=`$dir/echopath "$dir"`
63-
CLASSPATH="$comdnmrguidir/comdnmrgui-$comdnmrguiver.jar;$CLASSPATH"
63+
CLASSPATH="$comdnmrguidir/ringnmrgui-$comdnmrguiver.jar;$CLASSPATH"
6464
elif $iscygwin ; then
6565
CLASSPATH=`cygpath -pu "$CLASSPATH"`
66-
CLASSPATH="$dir/comdnmrgui-$comdnmrguiver.jar;$CLASSPATH"
66+
CLASSPATH="$dir/ringnmrgui-$comdnmrguiver.jar;$CLASSPATH"
6767
CLASSPATH=`cygpath -pw "$CLASSPATH"`
6868
else
69-
CLASSPATH="$dir/comdnmrgui-$comdnmrguiver.jar:$CLASSPATH"
69+
CLASSPATH="$dir/ringnmrgui-$comdnmrguiver.jar:$CLASSPATH"
7070
fi
7171
fi
7272

src/main/scripts/comdnmrgui.bat renamed to src/main/scripts/ringnmrgui.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ set comdnmrmain=org.comdnmr.gui.MainApp
2020
set dir=%~dp0
2121
set javaexe=java
2222

23-
set cp="%dir%comdnmrgui-%nvjver%.jar;%dir%lib/Manifest.jar"
23+
set cp="%dir%ringnmrgui-%nvjver%.jar;%dir%lib/Manifest.jar"
2424

2525
set testjava=%dir%jre\bin\java.exe
2626

2727
if exist %testjava% (
2828
set javaexe="%testjava%"
29-
set cp="%dir%lib/comdnmrgui-%comdnmrver%.jar;%dir%lib/%Manifest.jar"
29+
set cp="%dir%lib/ringnmrgui-%comdnmrver%.jar;%dir%lib/%Manifest.jar"
3030
)
3131

3232

0 commit comments

Comments
 (0)