Changeset 2519

Timestamp:

10/22/08 13:38:18 (3 months ago)

Author:

ahodgkinson

Message:

digitalme: Minor install target fixes.

Location:

trunk/digitalme

Files:

• CMakeLists.txt (modified) (3 diffs)
• launchers/firefox-addon/CMakeLists.txt (modified) (5 diffs)

trunk/digitalme/CMakeLists.txt

@@ -223 +223 @@
         )
         
+        # Launchers
+        
+        install( 
+                DIRECTORY ./launchers
+                DESTINATION ${SOURCE_INSTALL_PREFIX}/
+                PATTERN ".svn" EXCLUDE
+                PATTERN "build" EXCLUDE
+                PATTERN "CMakeCache.txt" EXCLUDE
+                PATTERN "CMakeFiles" EXCLUDE
+                PATTERN "cmake_install.cmake" EXCLUDE
+                PATTERN "install_manifest.txt" EXCLUDE
+                PATTERN "configure" EXCLUDE
+        )
+        
+        install(
+                FILES ./launchers/firefox-addon/configure
+                DESTINATION ${SOURCE_INSTALL_PREFIX}/launchers/firefox-addon
+                PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
+        )
+        
 endif( SOURCE_INSTALL_PREFIX)
 
@@ -299 +319 @@
 install( 
         DIRECTORY ${LIBRARY_OUTPUT_PATH}
-        DESTINATION ${PRODUCT_INSTALL_PREFIX}/lib/
+        DESTINATION ${PRODUCT_INSTALL_PREFIX}/lib
         PATTERN "lib/${PROJECT_NAME}/ftk" EXCLUDE
         PATTERN "lib/${PROJECT_NAME}/iss" EXCLUDE
@@ -313 +333 @@
 install( 
         DIRECTORY ${EXECUTABLE_OUTPUT_PATH}
-        DESTINATION ${PRODUCT_INSTALL_PREFIX}/
+        DESTINATION ${PRODUCT_INSTALL_PREFIX}
         PATTERN "bin/bin" EXCLUDE
         PATTERN "bin/dmcl" EXCLUDE

trunk/digitalme/launchers/firefox-addon/CMakeLists.txt

@@ -24 +24 @@
 # Project
 
-project( digitalme-xpi)
+project( digitalme-firefox)
 
 # Component paths
@@ -33 +33 @@
 endif( NOT FTK_DIR)
 
+# Verbose makefile
+
+# set( CMAKE_VERBOSE_MAKEFILE TRUE)
+
 # Include the local modules directory
 
 set( CMAKE_MODULE_PATH "${FTK_DIR}/CMakeModules")
 
-# Define directories
+# Default install prefix
 
-set( CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR}/build)
-set( PROJECT_BINARY_DIR ${CMAKE_BINARY_DIR})
-set( PACKAGE_STAGE_DIR ${PROJECT_BINARY_DIR}/package-stage CACHE PATH
-        "Output directory for package staging.")
-set( INSTALL_RDF_FILE ${PACKAGE_STAGE_DIR}/install.rdf)
+if( UNIX)
+        set( PRODUCT_INSTALL_PREFIX /usr)
+endif( UNIX)
 
 # Set the project version
@@ -72 +74 @@
 
 include( CommonConfig)
+
+# Define directories
+
+set( PACKAGE_STAGE_DIR ${PROJECT_BINARY_DIR}/package-stage CACHE PATH
+        "Output directory for package staging.")
+set( INSTALL_RDF_FILE ${PACKAGE_STAGE_DIR}/install.rdf)
 
 # Build type
@@ -138 +146 @@
 
 add_custom_target( xpi-jar
-        COMMAND zip identityselector.jar content/*
-        COMMAND rm -rf content
+        COMMAND zip -r identityselector.jar content
         WORKING_DIRECTORY ${PACKAGE_STAGE_DIR}/chrome
 )
@@ -147 +154 @@
 
 add_custom_target( xpi ALL
-        COMMAND rm -rf ../${PROJECT_NAME}-${PROJECT_VERSION}.xpi
-        COMMAND zip -r ../${PROJECT_NAME}-${PROJECT_VERSION}.xpi *
+        COMMAND rm -f ../${PROJECT_NAME}-${PROJECT_VERSION}.xpi
+        COMMAND zip -r ../${PROJECT_NAME}-${PROJECT_VERSION}.xpi . 
         WORKING_DIRECTORY ${PACKAGE_STAGE_DIR}
-        COMMAND rm -rf ${PACKAGE_STAGE_DIR}
         VERBATIM
 )
 
 add_dependencies( xpi xpi-jar)
+
+if( UNIX)
+        install(
+                DIRECTORY DESTINATION ${PRODUCT_INSTALL_PREFIX}/lib/firefox/extensions/{b65efa6d-ca84-4226-bde7-8feee2f62519}   
+        )
+
+        install(
+                CODE
+                "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E chdir .
+                        unzip -o ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-${PROJECT_VERSION}.xpi -d 
+                                ${PRODUCT_INSTALL_PREFIX}/lib/firefox/extensions/{b65efa6d-ca84-4226-bde7-8feee2f62519})"
+        )
+endif( UNIX)