[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r3904: Move the tarball part of package.sh into a proper CMake targ (vidalia/trunk/pkg)



Author: edmanm
Date: 2009-06-28 11:53:49 -0400 (Sun, 28 Jun 2009)
New Revision: 3904

Modified:
   vidalia/trunk/pkg/CMakeLists.txt
   vidalia/trunk/pkg/package.sh
Log:

Move the tarball part of package.sh into a proper CMake target.


Modified: vidalia/trunk/pkg/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/CMakeLists.txt	2009-06-28 11:50:24 UTC (rev 3903)
+++ vidalia/trunk/pkg/CMakeLists.txt	2009-06-28 15:53:49 UTC (rev 3904)
@@ -25,3 +25,20 @@
   ${CMAKE_CURRENT_BINARY_DIR}/package.sh
   COPYONLY
 )
+
+set(basename "vidalia-${VERSION}")
+set(tarname "${basename}.tar.gz")
+add_custom_target(dist
+  COMMAND svn export
+    ${Vidalia_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${basename}
+  COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_BINARY_DIR}
+    tar czf ${tarname} ${basename}/
+  COMMAND ${CMAKE_COMMAND} -E copy
+    ${CMAKE_CURRENT_BINARY_DIR}/${tarname} ${Vidalia_BINARY_DIR}
+  COMMAND ${CMAKE_COMMAND} -E remove -f
+    ${CMAKE_CURRENT_BINARY_DIR}/${tarname}
+  COMMAND ${CMAKE_COMMAND} -E remove_directory
+    ${CMAKE_CURRENT_BINARY_DIR}/${basename}
+  COMMENT "Creating ${tarname}"
+)
+

Modified: vidalia/trunk/pkg/package.sh
===================================================================
--- vidalia/trunk/pkg/package.sh	2009-06-28 11:50:24 UTC (rev 3903)
+++ vidalia/trunk/pkg/package.sh	2009-06-28 15:53:49 UTC (rev 3904)
@@ -16,32 +16,13 @@
 # Check for proper script arguments
 if [ "$#" -eq 0 ]
 then
-  echo "Usage: $0 <tarball|win32|osx|osx-bundle|osx-split-bundle>"
+  echo "Usage: $0 <osx|osx-bundle|osx-split-bundle|rpm>"
   exit 1
 fi
 
 # Make the distribution depending on what type was requested
 case "$1" in
 #
-# Source tarball (.tar.gz)
-#
-"tarball")
-  # Put the tarball in the current directory
-  destdir=`pwd`
-  srcdir=`dirname $(pwd) | sed -e "s/.*\///"`
-  tarball="$destdir/$srcdir.tar.gz"
-  
-  echo "Creating source tarball: $tarball"  
-  pushd "../.." 1>/dev/null
-  filelist=`svn ls -R $srcdir/ | 
-              sed -e "s/^/$srcdir\/&/" | 
-              sed -e "/\/$/d" |
-              sed -e "s/\n/ /"`
-  tar -czf "$tarball" $filelist
-  popd -1 1>/dev/null
-  ;;
- 
-#
 # OS X .dmg
 #
 "osx")