Made packaging scripts an opt-in, not default

digiverse · Feb 2, 2014 · 6027b18 · 6027b18
1 parent bd6e107
commit 6027b18
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
-/*.txt.user
+/*.txt.user
+/package/debian/changelog
+/package/ubuntu/changelog
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -159,15 +159,16 @@ endif()
 
 # packaging
 
-if(APPLE)
-    include(package/osx/pkg.cmake)
-elseif(UNIX)
-    include(package/rpm/rpm.cmake)
-    include(package/debian/deb.cmake)
-    include(package/ubuntu/deb.cmake)
-else() # Windows ...
-    include(package/windows/zip.cmake)
+if( XDISPATCH_INCLUDE_PACKAGING )
+    if(APPLE)
+        include(package/osx/pkg.cmake)
+    elseif(UNIX)
+        include(package/rpm/rpm.cmake)
+        include(package/debian/deb.cmake)
+        include(package/ubuntu/deb.cmake)
+    else() # Windows ...
+        include(package/windows/zip.cmake)
+    endif()
+
+    include(CPack)
 endif()
-
-
-include(CPack)
diff --git a/package/debian/changelog.in b/package/debian/changelog.in
@@ -1,6 +1,6 @@
 xdispatch (${XDISPATCH_VERSION}) unstable; urgency=low
 
-  * Unstable build of trunk revision ${XDISPATCH_WC_REVISION}
+  * Unstable build of master commit ${XDISPATCH_WC_REVISION}
 
  -- Marius Zwicker <[email protected]>  ${MZ_DATE_STRING}
 

diff --git a/package/ubuntu/changelog.in b/package/ubuntu/changelog.in
@@ -1,6 +1,6 @@
 xdispatch (${XDISPATCH_VERSION}-0ubuntu1) precise; urgency=low
 
-  * Unstable build of trunk revision ${XDISPATCH_WC_REVISION}
+  * Unstable build of master commit ${XDISPATCH_WC_REVISION}
 
  -- Marius Zwicker <[email protected]>  ${MZ_DATE_STRING}