Avoid copying the chrome encryption key during build
authorMark Donnelly <mark@painless-security.com>
Wed, 13 May 2015 10:32:54 +0000 (06:32 -0400)
committerMark Donnelly <mark@painless-security.com>
Wed, 13 May 2015 10:32:54 +0000 (06:32 -0400)
browsers/chrome/CMakeLists.txt

index 31357e9..4e5bb73 100644 (file)
@@ -1,12 +1,11 @@
 # CMakeLists for Chrome
 cmake_minimum_required(VERSION 2.8)
 if (DEFINED ENV{GSSWEB_CRX_PEM})
-  set(COPY_CRX_PEM COMMAND ${CMAKE_COMMAND} -E copy $ENV{GSSWEB_CRX_PEM} chrome.pem)
   if (WIN32)
     GET_FILENAME_COMPONENT(CHROME_ROOT_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Google Chrome;InstallLocation]" ABSOLUTE)
-    set(BUILD_CRX COMMAND ${CHROME_ROOT_PATH}\\chrome.exe --pack-extension=${CMAKE_CURRENT_BINARY_DIR}\\gssweb --pack-extension-key=${CMAKE_CURRENT_BINARY_DIR}\\chrome.pem)
+    set(BUILD_CRX COMMAND ${CHROME_ROOT_PATH}\\chrome.exe --pack-extension=${CMAKE_CURRENT_BINARY_DIR}\\gssweb --pack-extension-key=$ENV{GSSWEB_CRX_PEM})
   else (WIN32)
-    set(BUILD_CRX COMMAND /usr/bin/chromium-browser --pack-extension=./gssweb --pack-extension-key=./chrome.pem)
+    set(BUILD_CRX COMMAND /usr/bin/chromium-browser --pack-extension=./gssweb --pack-extension-key=$ENV{GSSWEB_CRX_PEM})
   endif (WIN32)
 endif (DEFINED ENV{GSSWEB_CRX_PEM})
 add_custom_target( gssweb.crx ALL
@@ -14,6 +13,5 @@ add_custom_target( gssweb.crx ALL
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/contentscript.js gssweb/contentscript.js
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/gssweb/manifest.json gssweb/manifest.json
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js gssweb/navigator.gssEap.js
-  ${COPY_CRX_PEM}
   ${BUILD_CRX}
 )