From 6b220145f9571681d10742f00ffb42ea226e3851 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 17 Oct 2015 11:13:02 +0200
Subject: cmake: regen tarball even if exists

---
 make-tar.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'make-tar.sh')

diff --git a/make-tar.sh b/make-tar.sh
index cd5abc56..8954a4ba 100644
--- a/make-tar.sh
+++ b/make-tar.sh
@@ -3,6 +3,8 @@
 prefix="$1"
 filename="$2"
 
+rm -fv "$filename"
+
 if  : &&
     cd $(dirname -- "${prefix}") &&
     zip -9r "${filename}" $(basename "${prefix}")
-- 
cgit v1.2.3


From 97b6c47b21f5d2bfb7a43969f67d6b3ad6edab28 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 17 Oct 2015 12:07:33 +0200
Subject: cmake: upload tarball to Dropbox but only if I'm the user

---
 CMakeLists.txt |  4 +++-
 make-tar.sh    | 15 +++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'make-tar.sh')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 197bad8b..482bdb6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,7 +216,9 @@ set(filename_0 "${OPENTRACK_COMMIT}")
 string(TIMESTAMP filename_1 "%Y%m%d%H%M%S")
 set(filename "${CMAKE_BINARY_DIR}/${filename_0}-${filename_1}.zip")
 
-add_custom_command(OUTPUT ${filename} COMMAND /usr/bin/env sh "${CMAKE_SOURCE_DIR}/make-tar.sh" "${CMAKE_INSTALL_PREFIX}" "${filename}")
+add_custom_command(OUTPUT ${filename} COMMAND /usr/bin/env sh
+    "${CMAKE_SOURCE_DIR}/make-tar.sh" "${CMAKE_INSTALL_PREFIX}"
+    "${filename}" "${CMAKE_BINARY_DIR}")
 add_custom_target(tarball DEPENDS "${filename}")
 
 opentrack_module(opentrack-api opentrack)
diff --git a/make-tar.sh b/make-tar.sh
index 8954a4ba..e831f16a 100644
--- a/make-tar.sh
+++ b/make-tar.sh
@@ -2,16 +2,23 @@
 
 prefix="$1"
 filename="$2"
+bin="$3"
 
-rm -fv "$filename"
+cmake --build "$bin" --target install || exit 1
 
 if  : &&
     cd $(dirname -- "${prefix}") &&
     zip -9r "${filename}" $(basename "${prefix}")
 then
-    ls -lh -- "${filename}"
-    case "$(uname -s)" in
-        CYGWIN_*) ls -lh -- "$(cygpath -w -- "$filename")";;
+    case "$USER,$(uname -s)" in
+        # for the script see https://github.com/andreafabrizi/Dropbox-Uploader
+        sthalik,CYGWIN_*)
+            dropbox_uploader.sh -p upload "$filename" / &&
+            l="$(dropbox_uploader.sh share "/$filename")" &&
+            f="$(echo "$l" | tr -d '\n\r' | egrep -o 'https://[^ ]+$')" &&
+            test -n "$f" && { echo "$f"; echo -n "$f" | putclip; }
+            echo -ne '\a' ;;
+        *) ls -lh -- "${filename}" ;;
     esac
 else
     rm -fv -- "${filename}"
-- 
cgit v1.2.3


From bcf12504559ff6acce3d6ea3020fbe8430ac64cc Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 18 Oct 2015 09:02:11 +0200
Subject: cmake: fix tarball invocation

---
 make-tar.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'make-tar.sh')

diff --git a/make-tar.sh b/make-tar.sh
index e831f16a..82afd67e 100644
--- a/make-tar.sh
+++ b/make-tar.sh
@@ -4,6 +4,7 @@ prefix="$1"
 filename="$2"
 bin="$3"
 
+cmake "$bin" || exit 1
 cmake --build "$bin" --target install || exit 1
 
 if  : &&
@@ -13,10 +14,12 @@ then
     case "$USER,$(uname -s)" in
         # for the script see https://github.com/andreafabrizi/Dropbox-Uploader
         sthalik,CYGWIN_*)
-            dropbox_uploader.sh -p upload "$filename" / &&
-            l="$(dropbox_uploader.sh share "/$filename")" &&
-            f="$(echo "$l" | tr -d '\n\r' | egrep -o 'https://[^ ]+$')" &&
-            test -n "$f" && { echo "$f"; echo -n "$f" | putclip; }
+            set -x
+            dropbox_uploader.sh -p upload "$filename" /
+            l="$(dropbox_uploader.sh -q share "/$filename")"
+            set +x
+            test -n "$l" && echo -n "$l" | putclip
+            echo $l
             echo -ne '\a' ;;
         *) ls -lh -- "${filename}" ;;
     esac
-- 
cgit v1.2.3


From 14d27dd0998b18a2eb13d30c8680701a9b619a08 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 18 Oct 2015 09:38:10 +0200
Subject: cmake: fix dropbox share invocation

---
 make-tar.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'make-tar.sh')

diff --git a/make-tar.sh b/make-tar.sh
index 82afd67e..9d1af1f3 100644
--- a/make-tar.sh
+++ b/make-tar.sh
@@ -14,10 +14,9 @@ then
     case "$USER,$(uname -s)" in
         # for the script see https://github.com/andreafabrizi/Dropbox-Uploader
         sthalik,CYGWIN_*)
-            set -x
             dropbox_uploader.sh -p upload "$filename" /
-            l="$(dropbox_uploader.sh -q share "/$filename")"
-            set +x
+            bn="$(basename -- "$filename")"
+            l="$(dropbox_uploader.sh -q share /"$bn")"
             test -n "$l" && echo -n "$l" | putclip
             echo $l
             echo -ne '\a' ;;
-- 
cgit v1.2.3


From f1e71e68512bc58f3f41ba4566f9d1574773d742 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 18 Oct 2015 09:44:47 +0200
Subject: cmake: regen before making tarball

Updates timestamp as it should.
---
 CMakeLists.txt      | 9 +++++----
 cmake/tarball.cmake | 8 ++++++++
 make-tar.sh         | 1 -
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 cmake/tarball.cmake

(limited to 'make-tar.sh')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 482bdb6c..78d9cab8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,10 +216,11 @@ set(filename_0 "${OPENTRACK_COMMIT}")
 string(TIMESTAMP filename_1 "%Y%m%d%H%M%S")
 set(filename "${CMAKE_BINARY_DIR}/${filename_0}-${filename_1}.zip")
 
-add_custom_command(OUTPUT ${filename} COMMAND /usr/bin/env sh
-    "${CMAKE_SOURCE_DIR}/make-tar.sh" "${CMAKE_INSTALL_PREFIX}"
-    "${filename}" "${CMAKE_BINARY_DIR}")
-add_custom_target(tarball DEPENDS "${filename}")
+add_custom_target(tarball-real)
+add_custom_target(tarball-real2)
+add_custom_command(TARGET tarball-real COMMAND cmake -P ${CMAKE_SOURCE_DIR}/cmake/tarball.cmake)
+add_custom_command(TARGET tarball-real2 COMMAND /usr/bin/env sh "${CMAKE_SOURCE_DIR}/make-tar.sh" "${CMAKE_INSTALL_PREFIX}" "${filename}" "${CMAKE_BINARY_DIR}")
+add_custom_target(tarball DEPENDS tarball-real)
 
 opentrack_module(opentrack-api opentrack)
 opentrack_qt(opentrack-api)
diff --git a/cmake/tarball.cmake b/cmake/tarball.cmake
new file mode 100644
index 00000000..5761e24a
--- /dev/null
+++ b/cmake/tarball.cmake
@@ -0,0 +1,8 @@
+execute_process(COMMAND cmake ${CMAKE_BINARY_DIR} RESULT_VARIABLE ret)
+if(NOT ret EQUAL 0)
+    message(FATAL_ERROR "can't regen")
+endif()
+execute_process(COMMAND cmake --build ${CMAKE_BINARY_DIR} --target tarball-real2)
+if(NOT ret EQUAL 0)
+    message(FATAL_ERROR "can't make tarball")
+endif()
diff --git a/make-tar.sh b/make-tar.sh
index 9d1af1f3..3e119d12 100644
--- a/make-tar.sh
+++ b/make-tar.sh
@@ -4,7 +4,6 @@ prefix="$1"
 filename="$2"
 bin="$3"
 
-cmake "$bin" || exit 1
 cmake --build "$bin" --target install || exit 1
 
 if  : &&
-- 
cgit v1.2.3