From b39aad4bab3ee515031ed238c6b7f3cccbff486e Mon Sep 17 00:00:00 2001
From: valerio <valerio@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 6 Jul 2010 10:14:15 +0000
Subject: [PATCH] Reverted previous commit
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2528 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
CPackConfig.cmake | 80 ++++++++++++++++++++++++++++
CPackSourceConfig.cmake | 87 +++++++++++++++++++++++++++++++
deployment/linux/create_bundle.py | 2 -
3 files changed, 167 insertions(+), 2 deletions(-)
create mode 100644 CPackConfig.cmake
create mode 100644 CPackSourceConfig.cmake
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
new file mode 100644
index 000000000..7c3c6cad0
--- /dev/null
+++ b/CPackConfig.cmake
@@ -0,0 +1,80 @@
+# This file will be configured to contain variables for CPack. These variables
+# should be set in the CMake list file of the project before CPack module is
+# included. Example variables are:
+# CPACK_GENERATOR - Generator used to create package
+# CPACK_INSTALL_CMAKE_PROJECTS - For each project (path, name, component)
+# CPACK_CMAKE_GENERATOR - CMake Generator used for the projects
+# CPACK_INSTALL_COMMANDS - Extra commands to install components
+# CPACK_INSTALL_DIRECTORIES - Extra directories to install
+# CPACK_PACKAGE_DESCRIPTION_FILE - Description file for the package
+# CPACK_PACKAGE_DESCRIPTION_SUMMARY - Summary of the package
+# CPACK_PACKAGE_EXECUTABLES - List of pairs of executables and labels
+# CPACK_PACKAGE_FILE_NAME - Name of the package generated
+# CPACK_PACKAGE_ICON - Icon used for the package
+# CPACK_PACKAGE_INSTALL_DIRECTORY - Name of directory for the installer
+# CPACK_PACKAGE_NAME - Package project name
+# CPACK_PACKAGE_VENDOR - Package project vendor
+# CPACK_PACKAGE_VERSION - Package project version
+# CPACK_PACKAGE_VERSION_MAJOR - Package project version (major)
+# CPACK_PACKAGE_VERSION_MINOR - Package project version (minor)
+# CPACK_PACKAGE_VERSION_PATCH - Package project version (patch)
+
+# There are certain generator specific ones
+
+# NSIS Generator:
+# CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Name of the registry key for the installer
+# CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS - Extra commands used during uninstall
+# CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra commands used during install
+
+
+SET(CPACK_BINARY_BUNDLE "OFF")
+SET(CPACK_BINARY_CYGWIN "")
+SET(CPACK_BINARY_DEB "OFF")
+SET(CPACK_BINARY_DRAGNDROP "OFF")
+SET(CPACK_BINARY_NSIS "OFF")
+SET(CPACK_BINARY_OSXX11 "OFF")
+SET(CPACK_BINARY_PACKAGEMAKER "ON")
+SET(CPACK_BINARY_RPM "OFF")
+SET(CPACK_BINARY_STGZ "ON")
+SET(CPACK_BINARY_TBZ2 "OFF")
+SET(CPACK_BINARY_TGZ "ON")
+SET(CPACK_BINARY_TZ "")
+SET(CPACK_BINARY_ZIP "")
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
+SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
+SET(CPACK_GENERATOR "PackageMaker;STGZ;TGZ")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "/Volumes/Data/Work/Software/OpenStructure;OpenStructure;ALL;/")
+SET(CPACK_INSTALL_PREFIX "/usr/local")
+SET(CPACK_MODULE_PATH "/Volumes/Data/Work/Software/OpenStructure/cmake_support")
+SET(CPACK_NSIS_DISPLAY_NAME "openstructure 1.0.0a1_2440")
+SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
+SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
+SET(CPACK_NSIS_PACKAGE_NAME "openstructure 1.0.0a1_2440")
+SET(CPACK_OUTPUT_CONFIG_FILE "/Volumes/Data/Work/Software/OpenStructure/CPackConfig.cmake")
+SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "/Volumes/Data/Work/Software/OpenStructure/ReadMe.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenStructure Framework")
+SET(CPACK_PACKAGE_FILE_NAME "OpenStructure-1.0.0a1_2440-Darwin-no_ui")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "openstructure 1.0.0a1_2440")
+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OpenStructure 1.0.0a1_2440")
+SET(CPACK_PACKAGE_NAME "OpenStructure")
+SET(CPACK_PACKAGE_RELOCATABLE "true")
+SET(CPACK_PACKAGE_VENDOR "2008-2010 -- The OpenStructure Team")
+SET(CPACK_PACKAGE_VERSION "1.0.0a1_2440")
+SET(CPACK_PACKAGE_VERSION_MAJOR "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "0a1_2440")
+SET(CPACK_RESOURCE_FILE_LICENSE "/Volumes/Data/Work/Software/OpenStructure/LICENSE.txt")
+SET(CPACK_RESOURCE_FILE_README "/opt/local/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
+SET(CPACK_RESOURCE_FILE_WELCOME "/opt/local/share/cmake-2.8/Templates/CPack.GenericWelcome.txt")
+SET(CPACK_SET_DESTDIR "OFF")
+SET(CPACK_SOURCE_CYGWIN "")
+SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;TZ")
+SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/Volumes/Data/Work/Software/OpenStructure/CPackSourceConfig.cmake")
+SET(CPACK_SOURCE_TBZ2 "ON")
+SET(CPACK_SOURCE_TGZ "ON")
+SET(CPACK_SOURCE_TZ "ON")
+SET(CPACK_SOURCE_ZIP "OFF")
+SET(CPACK_SYSTEM_NAME "Darwin-no_ui")
+SET(CPACK_TOPLEVEL_TAG "Darwin-no_ui")
diff --git a/CPackSourceConfig.cmake b/CPackSourceConfig.cmake
new file mode 100644
index 000000000..e3e74274e
--- /dev/null
+++ b/CPackSourceConfig.cmake
@@ -0,0 +1,87 @@
+# This file will be configured to contain variables for CPack. These variables
+# should be set in the CMake list file of the project before CPack module is
+# included. Example variables are:
+# CPACK_GENERATOR - Generator used to create package
+# CPACK_INSTALL_CMAKE_PROJECTS - For each project (path, name, component)
+# CPACK_CMAKE_GENERATOR - CMake Generator used for the projects
+# CPACK_INSTALL_COMMANDS - Extra commands to install components
+# CPACK_INSTALL_DIRECTORIES - Extra directories to install
+# CPACK_PACKAGE_DESCRIPTION_FILE - Description file for the package
+# CPACK_PACKAGE_DESCRIPTION_SUMMARY - Summary of the package
+# CPACK_PACKAGE_EXECUTABLES - List of pairs of executables and labels
+# CPACK_PACKAGE_FILE_NAME - Name of the package generated
+# CPACK_PACKAGE_ICON - Icon used for the package
+# CPACK_PACKAGE_INSTALL_DIRECTORY - Name of directory for the installer
+# CPACK_PACKAGE_NAME - Package project name
+# CPACK_PACKAGE_VENDOR - Package project vendor
+# CPACK_PACKAGE_VERSION - Package project version
+# CPACK_PACKAGE_VERSION_MAJOR - Package project version (major)
+# CPACK_PACKAGE_VERSION_MINOR - Package project version (minor)
+# CPACK_PACKAGE_VERSION_PATCH - Package project version (patch)
+
+# There are certain generator specific ones
+
+# NSIS Generator:
+# CPACK_PACKAGE_INSTALL_REGISTRY_KEY - Name of the registry key for the installer
+# CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS - Extra commands used during uninstall
+# CPACK_NSIS_EXTRA_INSTALL_COMMANDS - Extra commands used during install
+
+
+SET(CPACK_BINARY_BUNDLE "OFF")
+SET(CPACK_BINARY_CYGWIN "")
+SET(CPACK_BINARY_DEB "OFF")
+SET(CPACK_BINARY_DRAGNDROP "OFF")
+SET(CPACK_BINARY_NSIS "OFF")
+SET(CPACK_BINARY_OSXX11 "OFF")
+SET(CPACK_BINARY_PACKAGEMAKER "ON")
+SET(CPACK_BINARY_RPM "OFF")
+SET(CPACK_BINARY_STGZ "ON")
+SET(CPACK_BINARY_TBZ2 "OFF")
+SET(CPACK_BINARY_TGZ "ON")
+SET(CPACK_BINARY_TZ "")
+SET(CPACK_BINARY_ZIP "")
+SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
+SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
+SET(CPACK_GENERATOR "TGZ;TBZ2;TZ")
+SET(CPACK_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp$;\\.#;/#")
+SET(CPACK_INSTALLED_DIRECTORIES "/Volumes/Data/Work/Software/OpenStructure;/")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "")
+SET(CPACK_INSTALL_PREFIX "/usr/local")
+SET(CPACK_MODULE_PATH "/Volumes/Data/Work/Software/OpenStructure/cmake_support")
+SET(CPACK_NSIS_DISPLAY_NAME "openstructure 1.0.0a1_2440")
+SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
+SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
+SET(CPACK_NSIS_PACKAGE_NAME "openstructure 1.0.0a1_2440")
+SET(CPACK_OUTPUT_CONFIG_FILE "/Volumes/Data/Work/Software/OpenStructure/CPackConfig.cmake")
+SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "/Volumes/Data/Work/Software/OpenStructure/ReadMe.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "OpenStructure Framework")
+SET(CPACK_PACKAGE_FILE_NAME "OpenStructure-1.0.0a1_2440-Source")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "openstructure 1.0.0a1_2440")
+SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OpenStructure 1.0.0a1_2440")
+SET(CPACK_PACKAGE_NAME "OpenStructure")
+SET(CPACK_PACKAGE_RELOCATABLE "true")
+SET(CPACK_PACKAGE_VENDOR "2008-2010 -- The OpenStructure Team")
+SET(CPACK_PACKAGE_VERSION "1.0.0a1_2440")
+SET(CPACK_PACKAGE_VERSION_MAJOR "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "0")
+SET(CPACK_PACKAGE_VERSION_PATCH "0a1_2440")
+SET(CPACK_RESOURCE_FILE_LICENSE "/Volumes/Data/Work/Software/OpenStructure/LICENSE.txt")
+SET(CPACK_RESOURCE_FILE_README "/opt/local/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
+SET(CPACK_RESOURCE_FILE_WELCOME "/opt/local/share/cmake-2.8/Templates/CPack.GenericWelcome.txt")
+SET(CPACK_SET_DESTDIR "OFF")
+SET(CPACK_SOURCE_CYGWIN "")
+SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;TZ")
+SET(CPACK_SOURCE_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp$;\\.#;/#")
+SET(CPACK_SOURCE_INSTALLED_DIRECTORIES "/Volumes/Data/Work/Software/OpenStructure;/")
+SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/Volumes/Data/Work/Software/OpenStructure/CPackSourceConfig.cmake")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "OpenStructure-1.0.0a1_2440-Source")
+SET(CPACK_SOURCE_TBZ2 "ON")
+SET(CPACK_SOURCE_TGZ "ON")
+SET(CPACK_SOURCE_TOPLEVEL_TAG "Darwin-no_ui-Source")
+SET(CPACK_SOURCE_TZ "ON")
+SET(CPACK_SOURCE_ZIP "OFF")
+SET(CPACK_STRIP_FILES "")
+SET(CPACK_SYSTEM_NAME "Darwin-no_ui")
+SET(CPACK_TOPLEVEL_TAG "Darwin-no_ui-Source")
diff --git a/deployment/linux/create_bundle.py b/deployment/linux/create_bundle.py
index db2ed725f..9990ed3b7 100644
--- a/deployment/linux/create_bundle.py
+++ b/deployment/linux/create_bundle.py
@@ -145,8 +145,6 @@ subprocess.call('rm -rf $(find . -name *.pyc)',shell=True,cwd='../../')
print 'removing dokk and harmony examples from bundle'
subprocess.call('rm -rf '+directory_name+'/share/openstructure/examples/code_fragments/dokk',shell=True,cwd='../../')
subprocess.call('rm -rf '+directory_name+'/share/openstructure/examples/code_fragments/harmony',shell=True,cwd='../../')
-print 'removing README.html from bin directory in the package directory structure'
-subprocess.call('rm -fr '+directory_name+'/bin/README.html',shell=True,cwd='../../')
print 'De-hardcoding package python binary path from openstructure executables'
subprocess.call('rm scripts/ost.in',shell=True,cwd='../../')
subprocess.call('rm scripts/ost.in.pre*',shell=True,cwd='../../')
--
GitLab