From: Margaret Wasserman <mrw@painless-security.com>
Date: Fri, 29 May 2015 20:26:17 +0000 (-0400)
Subject: Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/gssweb
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=gssweb.git;a=commitdiff_plain;h=af8b2213bb4d53af522f7e4a2c39e1dfab842b72

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

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

af8b2213bb4d53af522f7e4a2c39e1dfab842b72
diff --cc browsers/chrome/CMakeLists.txt
index a5e42f2,4e5bb73..c438219
--- a/browsers/chrome/CMakeLists.txt
+++ b/browsers/chrome/CMakeLists.txt
@@@ -13,7 -12,6 +12,6 @@@ add_custom_target( gssweb.crx AL
    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 --cc browsers/firefox/CMakeLists.txt
index 7d3e32d,d43d98a..a518379
--- a/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
  )