Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb

Conflicts:
	browsers/chrome/CMakeLists.txt
	browsers/firefox/CMakeLists.txt

diff --combined browsers/chrome/CMakeLists.txt
index a5e42f2,4e5bb73..c438219
--- 1/browsers/chrome/CMakeLists.txt
--- 2/browsers/chrome/CMakeLists.txt
+++ b/browsers/chrome/CMakeLists.txt
@@@ -1,19 -1,17 +1,17 @@@
  # 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
    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/gssweb/background.js gssweb/background.js
    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.gss.js gssweb/navigator.gss.js
-   ${COPY_CRX_PEM}
 -  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js gssweb/navigator.gssEap.js
++  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js gssweb/navigator.gss.js
    ${BUILD_CRX}
  )

diff --combined browsers/firefox/CMakeLists.txt
index 7d3e32d,d43d98a..a518379
--- 1/browsers/firefox/CMakeLists.txt
--- 2/browsers/firefox/CMakeLists.txt
+++ b/browsers/firefox/CMakeLists.txt
@@@ -1,10 -1,14 +1,14 @@@
  cmake_minimum_required(VERSION 2.8)
  
  add_custom_target( gssweb.xpi ALL
-   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/package.json package.json
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/locales.json locales.json
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/main.js resources/gssweb/lib/main.js
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/contentscript.js resources/gssweb/data/contentscript.js
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/install.rdf install.rdf
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/harness-options.json harness-options.json
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/bootstrap.js bootstrap.js
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/packaging/defaults/preferences/prefs.js defaults/preferences/prefs.js
 -  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js chrome/content/navigator.gssEap.js
++  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gssEap.js chrome/content/navigator.gss.js
    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/chrome.manifest chrome.manifest
-   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/main.js lib/main.js
-   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/navigator.gss.js chrome/content/navigator.gss.js
-   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/../common/contentscript.js data/contentscript.js
-   COMMAND cfx xpi 
+   COMMAND zip gssweb.xpi locales.json resources/gssweb/lib/main.js ./resources/gssweb/data/contentscript.js ./install.rdf ./harness-options.json ./bootstrap.js ./defaults/preferences/prefs.js ./chrome/content/navigator.gssEap.js ./chrome.manifest
  )