Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Narvaez <dwnarvaez@gmail.com>2013-01-11 22:01:45 (GMT)
committer Daniel Narvaez <dwnarvaez@gmail.com>2013-01-11 22:01:45 (GMT)
commit45bf3873f34c29ca57bdc0a4811a12f89884a022 (patch)
treebd0222355535c20068d224131c3844ff21863534
parentb980fd9e4783bcfb489cf5d3fbe078852985ceab (diff)
Only build the snapshot, buildbot will upload
-rw-r--r--Makefile1
-rw-r--r--Makefile.commands3
-rw-r--r--Makefile.snapshot25
-rwxr-xr-xcommands/snapshot (renamed from tools/build-snapshot)19
4 files changed, 9 insertions, 39 deletions
diff --git a/Makefile b/Makefile
index fcf9fa8..abf5a28 100644
--- a/Makefile
+++ b/Makefile
@@ -12,4 +12,3 @@ all: build
include Makefile.config
include Makefile.commands
-include Makefile.snapshot
diff --git a/Makefile.commands b/Makefile.commands
index 2a02252..6662a7a 100644
--- a/Makefile.commands
+++ b/Makefile.commands
@@ -30,6 +30,9 @@ clean:
distribute:
@$(COMMANDS_DIR)/distribute
+snapshot:
+ @$(COMMANDS_DIR)/snapshot
+
build-%:
@$(COMMANDS_DIR)/build $*
diff --git a/Makefile.snapshot b/Makefile.snapshot
deleted file mode 100644
index c439cef..0000000
--- a/Makefile.snapshot
+++ /dev/null
@@ -1,25 +0,0 @@
-SNAPSHOT_DEST_HOST=dnarvaez@shell.sugarlabs.org
-SNAPSHOT_DEST_ROOT=/home/dnarvaez/public_html/snapshots/
-SNAPSHOT_DEST_DIR=$(SUGAR_BUILDBOT)
-SNAPSHOT_DEST_PATH=$(SNAPSHOT_DEST_ROOT)$(SNAPSHOT_DEST_DIR)
-SNAPSHOT_FILENAME=sugar-snapshot.tar
-SNAPSHOT_PATH=$(SNAPSHOT_TMP_DIR)/$(SNAPSHOT_FILENAME)
-SNAPSHOT_TMP_DIR:=$(shell mktemp -dut sugar-snapshot-XXXXXXXX)
-
-snapshot-build:
- @echo "Creating snapshot"
- @$(TOOLS_DIR)/build-snapshot $(SNAPSHOT_PATH)
-
-snapshot-copy: snapshot-build
- @echo "Uploading snapshot"
- @scp $(SNAPSHOT_PATH).xz $(SNAPSHOT_DEST_HOST):$(SNAPSHOT_DEST_PATH)
-
-snapshot-clean:
- @rm -rf $(SNAPSHOT_TMP_DIR)
-
-snapshot-notify:
- @echo "Notifying about upload completion"
- @ssh $(SNAPSHOT_DEST_HOST) $(SNAPSHOT_DEST_ROOT)/upload-completed \
- $(SNAPSHOT_DEST_DIR) $(SNAPSHOT_FILENAME).xz
-
-snapshot-upload: snapshot-copy snapshot-clean snapshot-notify
diff --git a/tools/build-snapshot b/commands/snapshot
index 7aaa1ea..c8200ca 100755
--- a/tools/build-snapshot
+++ b/commands/snapshot
@@ -1,15 +1,8 @@
#!/bin/sh
-toolsdir=`dirname "$0"`
-basedir=`dirname "$toolsdir"`
-
-if [ "$#" -eq 0 ]; then
- echo "build-snapshot [destination directory]"
- exit 1
-fi
-
-destdir=`dirname $1`
-filename=`basename $1`
+commandsdir=`dirname "$0"`
+destdir=`dirname "$commandsdir"`
+filename=snapshot.tar
rootdir=sugar-snapshot
mkdir -p $destdir
@@ -17,7 +10,7 @@ ln -s `pwd` $destdir/$rootdir
cd $destdir
-tar chf $filename \
+tar cvhf $filename \
$rootdir/config \
$rootdir/devbot \
$rootdir/install \
@@ -50,8 +43,8 @@ EOF
chmod +x $runshellscript
-tar rh -f $filename $runshellscript $runsugarscript
+tar rvh -f $filename $runshellscript $runsugarscript
rm -rf $rootdir
-xz $filename
+xz --verbose $filename