From 765dbab839497920a719b57194da2edffa3781a1 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 5 Sep 2010 21:37:44 +0100 Subject: [PATCH] separate source and binary tarballs for linux --- .gitignore | 2 +- README | 3 +++ build-sh | 18 +++++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7d36bd5..0ee79c8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ tmp Jarrg-ControlPanel.jar Jarrg-Uploader.jar jarrg-setup.exe -jarrg.tar.gz +jarrg-*.tar.gz jarrg-debug-* src/build/ src/net/chiark/yarrg/Version.java diff --git a/README b/README index c7528e3..6859fce 100644 --- a/README +++ b/README @@ -31,6 +31,9 @@ one of two things: Source ------ +This applies only if you have downloaded "jarrg-source.tar.gz". +The "jarrg-linux.tar.gz" package contains only the executable files. + To build from source you will need a Java SDK, version 6, and Apache ant, as well as NSIS to build the Windows installer package. diff --git a/build-sh b/build-sh index 24b8a0a..405e6d5 100755 --- a/build-sh +++ b/build-sh @@ -33,14 +33,22 @@ ant -f Jarrg.xml cd .. echo " -Building tarball +Building tarballs " -GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \ - --transform='s/^./jarrg/' --exclude=jarrg/{src/build,tmp} \ - -zcf jarrg.tar.gz . +tarball () { + output=$1; shift + GZIP='-9v --rsyncable' tar --exclude=\*{~,.tar.gz,.exe} --exclude='#*#' \ + --transform='s/^./jarrg/' --exclude={src/build,tmp} "$@" \ + -zcf "$output" . +} -files='jarrg.tar.gz jarrg-setup.exe' +tarball jarrg-source.tar.gz + +tarball jarrg-linux.tar.gz \ + --exclude={.git*,src,accessibility.properties,build-sh} \ + +files='jarrg-source.tar.gz jarrg-linux.tar.gz jarrg-setup.exe' echo " Generated OK: -- 2.30.2