chiark / gitweb /
rename: jpctb -> jarrg
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sat, 4 Sep 2010 21:16:35 +0000 (22:16 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sat, 4 Sep 2010 21:16:35 +0000 (22:16 +0100)
LICENCE
README
build-sh
jarrg [moved from jpctb with 85% similarity]
src/com/tedpearson/ypp/market/MarketUploader.java
src/winsetup.nsi

diff --git a/LICENCE b/LICENCE
index 26dd23f02b36bef3f573941349036e506620920c..903d09f74e1c4d0379d6e2db2283cf7c1794bb83 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -1,6 +1,6 @@
-jpctb is Free Software.
+Jarrg (and Yarrg) are Free Software.
 
-The Linux "jpctb" wrapper script is:
+The Linux "jarrg" wrapper script is:
   Copyright (C) 2009-2010 Ian Jackson
 
 com.tedpearson.* Java source code is:
diff --git a/README b/README
index eca9ddc3b66e502f2dd98bbf0835af62b74a2e00..c7528e3621d4003eb93273805ef139b663028232 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-JPCTB - a client for uploading to Yarrg and PCTB
+JARRG - a client for uploading to Yarrg and PCTB
 ================================================
 
 See the YARRG website for more information:
@@ -7,20 +7,20 @@ See the YARRG website for more information:
 Linux
 -----
 
-To run on Linux run this command from wherever you unpacked the JPCTB
+To run on Linux run this command from wherever you unpacked the JARRG
 distribution:
 
-./jpctb /path/to/yohoho/yohoho
+./jarrg /path/to/yohoho/yohoho
 
 
 Windows
 -------
 
-On Windows, double-click jpctb-setup.exe to install JPCTB.  It will do
+On Windows, double-click jarrg-setup.exe to install JARRG.  It will do
 one of two things:
 
 1) Just work, in which case you'll have a new icon on your desktop which
-   runs Puzzle Pirates with JPCTB integrated
+   runs Puzzle Pirates with JARRG integrated
 
 2) Fail, and tell you what to do next.  Usually this means installing a
    Java Runtime Environment (or JVM) and then uninstalling and re-
@@ -38,9 +38,9 @@ You can run the script "build-sh" do to the build:
   ./build-sh
 
 It will create in the current directory (the top level of the build)
-the .jar files for JPCTB and also the two distribution files:
-  jpctb-setup.exe   the installer for windows users
-  jpctb.tar.gz      a filtered tarball of this whole directory, for linux users
+the .jar files for JARRG and also the two distribution files:
+  jarrg-setup.exe   the installer for windows users
+  jarrg.tar.gz      a filtered tarball of this whole directory, for linux users
 
 Currently the build only seems to work with the Sun JDK, so the script
 sets JAVA_HOME to /usr/lib/jvm/java-6-sun.  If that's not what you
@@ -48,7 +48,7 @@ want, set JAVA_HOME yourself.
 
 To make shipping the files a bit easier it prints a rune for rsyncing
 the files to the test version on the distribution site.  You can set
-JPCTB_PUBLISH_BASE and ..._DIR to control the exact output.
+JARRG_PUBLISH_BASE and ..._DIR to control the exact output.
 
 If you want to clean out the build directory to make sure you get a
 rebuild from scratch, say
index 222429695e908c17d4400970252ae6de47ac7dba..a60db93f5b52395605f3f9403e314da4bb8d96d6 100755 (executable)
--- a/build-sh
+++ b/build-sh
@@ -37,18 +37,18 @@ Building tarball
 "
 
 GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \
-  --transform='s/^./jpctb/' --exclude=jpctb/{src/build,tmp} \
-  -zcf jpctb.tar.gz .
+  --transform='s/^./jarrg/' --exclude=jarrg/{src/build,tmp} \
+  -zcf jarrg.tar.gz .
 
-files='jpctb.tar.gz jpctb-setup.exe'
+files='jarrg.tar.gz jarrg-setup.exe'
 
 echo "
 Generated OK:
 "
 ls -al $files
 
-pubbase="${JPCTB_PUBLISH_BASE-login.chiark.greenend.org.uk}"
-pubdir="${JPCTB_PUBLISH_DIR-/home/yarrgweb/public-html/download/jpctb}"
+pubbase="${JARRG_PUBLISH_BASE-login.chiark.greenend.org.uk}"
+pubdir="${JARRG_PUBLISH_DIR-/home/yarrgweb/public-html/download/jarrg}"
 
 echo "
 Revision: $revision
diff --git a/jpctb b/jarrg
similarity index 85%
rename from jpctb
rename to jarrg
index 50f295298b14b58b3cd688eafb23c4bef19aaaac..09dbbcde15a998531992d535b0ebc7eff6f10378 100755 (executable)
--- a/jpctb
+++ b/jarrg
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-# This is jpctb, a wrapper script for plumbing Ted Pearson's Java PCTB
+# This is jarrg, a wrapper script for plumbing Ted Pearson's Java PCTB
 # client into a JVM on Linux.
 
 # This program is Free Software.  Copyright (C) 2009 Ian Jackson.
 
 
 usage () { cat <<END
-usage: .../jpctb /path/to/yohoho/yohoho [...]
+usage: .../jarrg /path/to/yohoho/yohoho [...]
 END
 }
 
 fail () {
-       echo >&2 "jpctb: $*"
+       echo >&2 "jarrg: $*"
        exit 127
 }
 
@@ -50,10 +50,10 @@ setup_only_simulate=''
 while [ $# -ge 1 ]; do
        case "$1" in
        -)              shift; break;;
-       --jpctb)
+       --jarrg)
                        shift
                        srcjardir="$1"
-                       shift || badusage "--jpctb needs a value"
+                       shift || badusage "--jarrg needs a value"
                        ;;
        --check-only)
                        check_only=true
@@ -77,16 +77,16 @@ yohoho="$1"; shift
 
 #---------- find ourselves ----------
 
-jpctbdir="$0"
-jpctbdir="${jpctbdir%/*}"
+jarrgdir="$0"
+jarrgdir="${jarrgdir%/*}"
 
-case "$jpctbdir" in
+case "$jarrgdir" in
 /*)    ;;
-*)     jpctbdir="$PWD/$jpctbdir" ;;
+*)     jarrgdir="$PWD/$jarrgdir" ;;
 esac
 
 if [ x"$srcjardir" = x ]; then
-       srcjardir="$jpctbdir"
+       srcjardir="$jarrgdir"
 fi
 
 #---------- find YPP client and the Java installation it uses ----------
@@ -105,8 +105,8 @@ else
 fi
 
 cat <<END
-jpctb:
-   jpctb tree:  "$jpctbdir"
+jarrg:
+   jarrg tree:  "$jarrgdir"
    yohoho:       "$yohoho"
    ypp dir:      "$yppdir"
    ypp uses:     "$yppjava"
@@ -147,21 +147,21 @@ case "$javadir" in
 *)             javadir="$PWD/$javadir" ;;
 esac
 
-jtmp="$jpctbdir/tmp"
+jtmp="$jarrgdir/tmp"
 linkfarm="$jtmp/linkfarm"
 extdir="$jtmp/ext"
 
-export JPCTB_JRE="$javadir/$jreleaf"
-realjava="$JPCTB_JRE/bin/java"
+export JARRG_JRE="$javadir/$jreleaf"
+realjava="$JARRG_JRE/bin/java"
 
 #---------- confirm for the user which paths we're using ----------
 
 cat <<END
    java dir.:    "$javadir"
-   jre:          "$JPCTB_JRE"
+   jre:          "$JARRG_JRE"
    primary java: "$realjava"
-   jpctb jars:   "$srcjardir"
-   jpctb tmpdir: "$jtmp"
+   jarrg jars:   "$srcjardir"
+   jarrg tmpdir: "$jtmp"
 END
 
 #---------- run the control panel ----------
@@ -197,14 +197,14 @@ cp -Rs "$javadir"/. "$linkfarm"/.
 wrapper="$linkfarm"/$jreleaf/bin/java
 rm -- "$wrapper"
 
-export JPCTB_EXTDIR="$extdir"
+export JARRG_EXTDIR="$extdir"
 
 cat <<'END' >"$wrapper"
 #!/bin/bash
-       set -e$JPCTB_JWRAP_X
+       set -e$JARRG_JWRAP_X
 
        log () {
-               lh=`date +'%Y/%m/%d %H:%M:%S jpctb'`
+               lh=`date +'%Y/%m/%d %H:%M:%S jarrg'`
                printf >&2 "%s: %s |\f\n" "$lh" "$*"
        }
 
@@ -222,19 +222,19 @@ cat <<'END' >"$wrapper"
        nargs=${#args[*]}
        lastarg="${args[$(( $nargs - 1 ))]}"
 
-       fail () { echo >&2 "jpctb-java: $*"; exit 127; }
+       fail () { echo >&2 "jarrg-java: $*"; exit 127; }
 
        if [ x"$lastarg" = x"$yppclass" ]; then
 
-               [ x"$JPCTB_EXTDIR" != x ] || fail 'JPCTB_EXTDIR not set'
+               [ x"$JARRG_EXTDIR" != x ] || fail 'JARRG_EXTDIR not set'
 
-               set     -e$JPCTB_JWRAP_X -- \
+               set     -e$JARRG_JWRAP_X -- \
                        -Djavax.accessibility.assistive_technologies=$atclass \
-                       -Djava.ext.dirs="$JPCTB_EXTDIR:$JPCTB_JRE/lib/ext" \
+                       -Djava.ext.dirs="$JARRG_EXTDIR:$JARRG_JRE/lib/ext" \
                        "$@"
        fi
 
-       real="$JPCTB_JRE/bin/java"
+       real="$JARRG_JRE/bin/java"
        log "running $real $*"
        exec "$real" "$@"
 END
index 1b111cf1494bad083bdfde5483051fd49c8d3993..f91de7aedd25e93cbadbb3df782e46bfee03f0f6 100644 (file)
@@ -260,7 +260,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                        if (window.getAccessibleContext().getAccessibleName().equals("Puzzle Pirates")) frame.setVisible(true);
                        return;
                }
-               frame = new JFrame("MarketUploader");
+               frame = new JFrame("Jarrg Uploader");
                frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
                GridLayout layout = new GridLayout(2,1);
                frame.getContentPane().setLayout(layout);
index 86da9420043da80a72d81b75d28f235d59cceedd..abfafbca0b69fc64d98d2453384c1c6fea1329f4 100644 (file)
@@ -1,9 +1,9 @@
 !include FileFunc.nsh
 !insertmacro GetParent
 
-Name "JPCTB"
-OutFile "jpctb-setup.exe"
-InstallDir "$LOCALAPPDATA\JPCTB"
+Name "JARRG"
+OutFile "jarrg-setup.exe"
+InstallDir "$LOCALAPPDATA\JARRG"
 RequestExecutionLevel user
 
 var YPPDIR
@@ -20,23 +20,23 @@ Call FindJRE
 Call CheckYPP
 Call CopyJRE
 Call YPPShortcuts
-WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JPCTB" \
-"DisplayName" "JPCTB - Java Pirate Commodity Trader with Bleach"
-WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JPCTB" \
-"UninstallString" "$\"$INSTDIR\uninstall-jpctb.exe$\""
-WriteUninstaller "$INSTDIR\uninstall-jpctb.exe"
+WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JARRG" \
+"DisplayName" "JARRG - Java Pirate Commodity Trader with Bleach"
+WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JARRG" \
+"UninstallString" "$\"$INSTDIR\uninstall-jarrg.exe$\""
+WriteUninstaller "$INSTDIR\uninstall-jarrg.exe"
 SectionEnd
 
 Section "un."
 RMDir /r $INSTDIR\jre
-Delete $INSTDIR\uninstall-jpctb.exe
+Delete $INSTDIR\uninstall-jarrg.exe
 RMDIR $INSTDIR
 
-Delete "$SMPROGRAMS\JPCTB.lnk"
-Delete "$SMPROGRAMS\JPCTB Control Panel.lnk"
-Delete "$DESKTOP\JPCTB.lnk"
+Delete "$SMPROGRAMS\JARRG.lnk"
+Delete "$SMPROGRAMS\JARRG Control Panel.lnk"
+Delete "$DESKTOP\JARRG.lnk"
 
-DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JPCTB"
+DeleteRegKey HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\JARRG"
 
 SectionEnd
 
@@ -77,10 +77,10 @@ FunctionEnd
 
 Function YPPShortcuts
 SetOutPath $YPPDIR
-CreateShortCut "$DESKTOP\JPCTB.lnk" "$INSTDIR\jre\bin\javaw.exe" \
+CreateShortCut "$DESKTOP\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \
 "-jar getdown-dop.jar ." "$YPPDIR\app_icon.ico" 0 SW_SHOWNORMAL
-CreateShortCut "$SMPROGRAMS\JPCTB.lnk" "$INSTDIR\jre\bin\javaw.exe" \
+CreateShortCut "$SMPROGRAMS\JARRG.lnk" "$INSTDIR\jre\bin\javaw.exe" \
 "-jar getdown-dop.jar ." "$YPPDIR\app_icon.ico" 0 SW_SHOWNORMAL
-CreateShortCut "$SMPROGRAMS\JPCTB Control Panel.lnk" \
+CreateShortCut "$SMPROGRAMS\JARRG Control Panel.lnk" \
 "$INSTDIR\jre\bin\javaw.exe" "com.tedpearson.ypp.market.ControlPanel"
 FunctionEnd