diff --git a/checkin_notes b/checkin_notes index 472a474a4d..8ee2622050 100755 --- a/checkin_notes +++ b/checkin_notes @@ -22077,16 +22077,18 @@ David 3 Jan 2005 reduce_main.C (new) Bruce 5 Jan 2005 +Bruce 6 Jan 2005 - added new directory which builds a self-extracting tar archive (executable shell script) for installation on unix platforms. This will only be made when building the client GUI and installs both the boinc client and client GUI. Written and tested by Bernd Machenschalk. + - next day revision, name shell script with appropriate + version/release number from configure.ac + Makefile.am sea/ [New Directory] make-sea.sh - Makefile - BOINC/ - binstall.sh - + Makefile.in + BOINC/ [THIS DIRECTORY IS SPURIOUS: NO LONGER NEEDED] diff --git a/configure.ac b/configure.ac index 61acb29d8b..5fdfd1cd76 100644 --- a/configure.ac +++ b/configure.ac @@ -361,6 +361,7 @@ AC_CONFIG_FILES([ RSAEuro/source/Makefile sched/boinc_path_config.py:py/Boinc/boinc_path_config.py.in sched/Makefile + sea/Makefile test/boinc_path_config.py:py/Boinc/boinc_path_config.py.in test/Makefile test/version.inc diff --git a/sea/BOINC/binstall.sh b/sea/BOINC/binstall.sh deleted file mode 100644 index a44c7590aa..0000000000 --- a/sea/BOINC/binstall.sh +++ /dev/null @@ -1,4 +0,0 @@ -cd BOINC && -echo "cd \"`pwd`\" && ./boinc_client" > run_client && -chmod +x run_client -echo now run `pwd`/run_client to run the client and `pwd`/boinc_gui to run the GUI diff --git a/sea/Makefile b/sea/Makefile deleted file mode 100644 index 9929319258..0000000000 --- a/sea/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -all: boinc_sea.sh - -boinc_sea.sh: make-sea.sh sea.tar - sh make-sea.sh sea.tar boinc_sea.sh BOINC/binstall.sh - -sea.tar: BOINC/boinc_client BOINC/boinc_gui BOINC/binstall.sh - tar cf $@ $^ - -BOINC/boinc_client: ../client/boinc_client - cp $< $@ - -BOINC/boinc_gui: ../clientgui/boinc_gui - cp $< $@ - -clean: - rm -f BOINC/boinc_* sea.tar boinc_sea.sh diff --git a/sea/Makefile.in b/sea/Makefile.in new file mode 100644 index 0000000000..55cc2c4efb --- /dev/null +++ b/sea/Makefile.in @@ -0,0 +1,28 @@ +vers = @BOINC_MAJOR_VERSION@.@BOINC_MINOR_VERSION@_@target@ +sea = boinc_$(vers)_sea.sh + +all: $(sea) + +$(sea): sea.tar make-sea.sh Makefile + ./make-sea.sh $< $@ BOINC/binstall.sh + +sea.tar: BOINC/boinc_client BOINC/boinc_gui BOINC/binstall.sh + tar cf $@ $^ + +BOINC/boinc_client: ../client/boinc_client BOINC + cp $< $@ + +BOINC/boinc_gui: ../clientgui/boinc_gui BOINC + cp $< $@ + +BOINC/binstall.sh: BOINC + echo 'cd BOINC &&\ + echo "cd \"`pwd`\" && ./boinc_client" > run_client &&\ + chmod +x run_client &&\ + echo now run `pwd`/run_client to run the client and `pwd`/boinc_gui to run the GUI' > $@ + +BOINC: + mkdir -p BOINC + +clean: + rm -rf BOINC sea.tar $(sea)