Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make changes back into generation framework for FireFox extension #187

Open
wants to merge 5 commits into
base: 2.0
Choose a base branch
from
Open

Make changes back into generation framework for FireFox extension #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e36b06
Make changes back into generation framework for FireFox extension
ATather Feb 16, 2017
33ff6f8
Fix up examples
ATather Feb 16, 2017
a11084a
Use correct template variable
ATather Feb 16, 2017
9c36455
Merge branch '2.0' of https://github.com/ATather/FireBreath into 2.0
ATather Feb 17, 2017
b9825ca
Merge branch '2.0' of https://github.com/firebreath/FireBreath into 2.0
ATather Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/EchoTestPlugin/Win/projectDef.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ get_plugin_path(PLUGIN_FILEPATH ${PROJECT_NAME})
get_filename_component(PLUGIN_PATH ${PLUGIN_FILEPATH} DIRECTORY)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test in-line comment.

add_wix_installer( ${PLUGIN_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/Win/WiX/@{PLUGIN_ident}Installer.wxs
${CMAKE_CURRENT_SOURCE_DIR}/Win/WiX/EchoTestPluginInstaller.wxs
PluginDLLGroup
${PLUGIN_PATH}
$<TARGET_FILE:${PROJECT_NAME}>
Expand All @@ -70,7 +70,7 @@ add_wix_installer( ${PLUGIN_NAME}
# This is an example of how to add a build step to sign the WiX installer
# -- uncomment lines below this to enable signing --
#firebreath_sign_file("${PLUGIN_NAME}_WiXInstall"
# "${FB_BIN_DIR}/${PLUGIN_NAME}/${CMAKE_CFG_INTDIR}/${PLUGIN_NAME}.msi"
# "${PLUGIN_PATH}/${PLUGIN_NAME}.msi"
# "${CMAKE_CURRENT_SOURCE_DIR}/sign/certificate.pfx"
# "${CMAKE_CURRENT_SOURCE_DIR}/sign/passphrase.txt"
# "http://timestamp.verisign.com/scripts/timestamp.dll")
Expand All @@ -80,6 +80,6 @@ add_wix_installer( ${PLUGIN_NAME}
#create_cab(${PLUGIN_NAME}
# ${CMAKE_CURRENT_SOURCE_DIR}/Win/Wix/EchoTestPlugin.ddf
# ${CMAKE_CURRENT_SOURCE_DIR}/Win/Wix/EchoTestPlugin.inf
# ${FB_BIN_DIR}/${PLUGIN_NAME}/${CMAKE_CFG_INTDIR}/
# ${PLUGIN_PATH}
# ${PROJECT_NAME}_WiXInstallExe
# )
2 changes: 1 addition & 1 deletion examples/FBTestPlugin/Win/projectDef.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ get_plugin_path(PLUGIN_FILEPATH ${PROJECT_NAME})
get_filename_component(PLUGIN_PATH ${PLUGIN_FILEPATH} DIRECTORY)

add_wix_installer( ${PLUGIN_NAME}
${CMAKE_CURRENT_SOURCE_DIR}/Win/WiX/GCPlugin2Installer.wxs
${CMAKE_CURRENT_SOURCE_DIR}/Win/WiX/FBTestPluginInstaller.wxs
PluginDLLGroup
${PLUGIN_PATH}
$<TARGET_FILE:${PROJECT_NAME}>
Expand Down
6 changes: 6 additions & 0 deletions fbgen/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,9 @@ add_native_message_host(${PROJECT_NAME})
# "${CMAKE_CURRENT_SOURCE_DIR}/sign/passphrase.txt"
# ${PROJECT_NAME})

#firebreath_sign_file("${PLUGIN_NAME}"
# "${PLUGIN_PATH}/${FBSTRING_HostFileName}.exe"
# "${CMAKE_CURRENT_SOURCE_DIR}/sign/certificate.pfx"
# "${CMAKE_CURRENT_SOURCE_DIR}/sign/passphrase.txt"
# "http://timestamp.verisign.com/scripts/timestamp.dll")

4 changes: 3 additions & 1 deletion fbgen/src/PluginConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ set(PLUGIN_CRX_KEY "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOqMBmB8ThMqFT3/9s/bfS
set(PLUGIN_CRX_ID "dlfdfkalmjbghacnadegnkmbcnpmnmfn")
set(PLUGIN_CRX_WYRMHOLE_NAME ${COMPANY_NAME})
set(PLUGIN_CRX_NATIVEHOST_NAME "${COMPANY_REVDOMAIN}.firewyrmhost")
set(PLUGIN_MOZ_ID "@{PLUGIN_ident}\@@{COMPANY_domain}")
set(PLUGIN_CRX_NATIVEHOST_DESCRIPTION "${COMPANY_NAME} FireWyrm Native Messaging Wyrmhole")
set(FBSTRING_HostFileName "FireWyrmNativeMessageHost")
set(PLUGIN_MOZ_ID "@{PLUGIN_ident}@@@{COMPANY_domain}")

# ActiveX constants:
set(FBTYPELIB_NAME @{PLUGIN_ident}Lib)
Expand Down
75 changes: 66 additions & 9 deletions fbgen/src/Win/WiX/TemplateInstaller.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
KeyPath="yes" />
</Component>
<Component Id="FireWyrmNativeMessageHost" Guid="{7056973D-34AE-449E-8B30-981B05EAEC99}">
<File Id="Manifest_template_chrome" Source="$(var.BINSRC)\${PLUGIN_CRX_NATIVEHOST_NAME}_chrome.template" Name="${PLUGIN_CRX_NATIVEHOST_NAME}_chrome.json" />
<File Id="Manifest_template_mozilla" Source="$(var.BINSRC)\${PLUGIN_CRX_NATIVEHOST_NAME}_mozilla.template" Name="${PLUGIN_CRX_NATIVEHOST_NAME}_mozilla.json" />
<File Id="Manifest_template_chrome" Source="$(var.TPLSRC))\${PLUGIN_CRX_NATIVEHOST_NAME}_chrome.template" Name="${PLUGIN_CRX_NATIVEHOST_NAME}_chrome.json" />
<File Id="Manifest_template_mozilla" Source="$(var.TPLSRC))\${PLUGIN_CRX_NATIVEHOST_NAME}_mozilla.template" Name="${PLUGIN_CRX_NATIVEHOST_NAME}_mozilla.json" />
<SystemTools:TemplateFile Id="Manifest_template_process_component_crx" Source="[#Manifest_template_chrome]" Target="[INSTALLDIR]${PLUGIN_CRX_NATIVEHOST_NAME}_chrome.json" ExecuteOnInstall="yes" ExecuteOnReInstall="yes">
<SystemTools:TemplateFileProperty Id="FILENAME_property_crx" Name="Filepath" Value="[INSTALLDIR]FireWyrmNativeMessageHost.exe" Escape="yes" />
<SystemTools:TemplateFileProperty Id="FILENAME_property_crx" Name="Filepath" Value="[INSTALLDIR]${FBSTRING_HostFileName}.exe" Escape="yes" />
</SystemTools:TemplateFile>
<SystemTools:TemplateFile Id="Manifest_template_process_component_moz" Source="[#Manifest_template_mozilla]" Target="[INSTALLDIR]${PLUGIN_CRX_NATIVEHOST_NAME}_mozilla.json" ExecuteOnInstall="yes" ExecuteOnReInstall="yes">
<SystemTools:TemplateFileProperty Id="FILENAME_property_moz" Name="Filepath" Value="[INSTALLDIR]FireWyrmNativeMessageHost.exe" Escape="yes" />
<SystemTools:TemplateFileProperty Id="FILENAME_property_moz" Name="Filepath" Value="[INSTALLDIR]${FBSTRING_HostFileName}.exe" Escape="yes" />
</SystemTools:TemplateFile>
<File Id="FireWyrmNativeMessageHostExe" Source="$(var.BINSRC)\FireWyrmNativeMessageHost.exe" />
<File Id="FireWyrmNativeMessageHostExe" Source="$(var.BINSRC)\${FBSTRING_HostFileName}.exe" />
<RegistryValue
Root="HKCU"
Key="SOFTWARE\${COMPANY_NAME}\${PLUGIN_NAME}"
Expand All @@ -76,7 +76,7 @@
Id="NativeHostChromeManifestRegEntry"
Key="SOFTWARE\Google\Chrome\NativeMessagingHosts\${PLUGIN_CRX_NATIVEHOST_NAME}"
Type="string"
Value="[INSTALLDIR]\${PLUGIN_CRX_NATIVEHOST_NAME}_chrome.json"
Value="[INSTALLDIR]${PLUGIN_CRX_NATIVEHOST_NAME}_chrome.json"
KeyPath="yes" />
</Component>
<Component Id="NativeMessageMozillaRegistry" Guid="{D6D3F029-E3B9-477F-B999-DE12CAD9EE6C}" Win64="yes">
Expand All @@ -85,11 +85,23 @@
Id="NativeHostMozillaManifestRegEntry"
Key="SOFTWARE\Mozilla\NativeMessagingHosts\${PLUGIN_CRX_NATIVEHOST_NAME}"
Type="string"
Value="[INSTALLDIR]\${PLUGIN_CRX_NATIVEHOST_NAME}_mozilla.json"
Value="[INSTALLDIR]${PLUGIN_CRX_NATIVEHOST_NAME}_mozilla.json"
KeyPath="yes" />
</Component>

<!-- Put Additional files here: -->

<!-- Get Chrome to download from WebStore
<Component Id="ChromeExtensionCrx" Guid="*">
<RegistryValue
Root="HKCU"
Id="ChromeExtensionRegEntry"
Key="SOFTWARE\Google\Chrome\Extensions\${PLUGIN_CRX_ID}"
Name="update_url"
Type="string"
Value="https://clients2.google.com/service/update2/crx" />
</Component>
-->

<!-- Put Additional files here: -->
<!-- example:
<Component Id="UniqueComponentId" Guid="*">
<File Id="uniqueFileId" KeyPath="yes" Source="SourceDir\filename.ext" />
Expand All @@ -99,6 +111,46 @@
</Directory>
</Directory>
</Directory>

<!-- Install mozilla signed xpi file
<Directory Id="MozillaDir" Name="Mozilla">
<Component Id="MozillaId" Guid="{8D53282B-2D6D-4611-8E82-CBB80914D8B4}">
<RemoveFolder Id="RemoveMozillaDir" On="uninstall" />
<RegistryValue
Root="HKCU"
Key="SOFTWARE\${COMPANY_NAME}\${PLUGIN_NAME}"
Name="MozillaIdInstalled"
Type="string"
Value="true"
KeyPath="yes" />
</Component>
<Directory Id="MozillaExtDir" Name ="Extensions">
<Component Id="MozillaExtId" Guid="{5A2C0C7D-7631-43F8-8E82-F4756830ED58}">
<RemoveFolder Id="RemoveMozillaExtDir" On="uninstall" />
<RegistryValue
Root="HKCU"
Key="SOFTWARE\${COMPANY_NAME}\${PLUGIN_NAME}"
Name="MozillaExtIdInstalled"
Type="string"
Value="true"
KeyPath="yes" />
</Component>
<Directory Id="FireFoxAppIdDir" Name="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
<Component Id="ExtId" Guid="*">
<RemoveFolder Id="RemoveFireFoxAppIdDir" On="uninstall" />
<File Id="Extension.Id" Source="${CMAKE_CURRENT_SOURCE_DIR}/xpi/your_signed_extension-1.0.0.0-an+fx-windows.xpi" Name="${PLUGIN_MOZ_ID}.xpi" />
<RegistryValue
Root="HKCU"
Key="SOFTWARE\${COMPANY_NAME}\${PLUGIN_NAME}"
Name="ExtIdInstalled"
Type="string"
Value="true"
KeyPath="yes" />
</Component>
</Directory>
</Directory>
</Directory>
-->
</Directory>
</Directory>

Expand All @@ -110,6 +162,11 @@
<ComponentRef Id="FireWyrmNativeMessageHost"/>
<ComponentRef Id="NativeMessageChromeRegistry"/>
<ComponentRef Id="NativeMessageMozillaRegistry"/>
<!-- <ComponentRef Id="ChromeExtensionCrx"/> -->
<!-- <ComponentRef Id="MozillaId"/>
<ComponentRef Id="MozillaExtId"/>
<ComponentRef Id="ExtId"/>
-->
</Feature>
</Product>
</Wix>
6 changes: 3 additions & 3 deletions fbgen/src/Win/projectDef.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ add_wix_installer( ${PLUGIN_NAME}
# This is an example of how to add a build step to sign the WiX installer
# -- uncomment lines below this to enable signing --
#firebreath_sign_file("${PLUGIN_NAME}_WiXInstall"
# "${FB_BIN_DIR}/${PLUGIN_NAME}/${CMAKE_CFG_INTDIR}/${PLUGIN_NAME}.msi"
# "${PLUGIN_PATH}/${PLUGIN_NAME}.msi"
# "${CMAKE_CURRENT_SOURCE_DIR}/sign/certificate.pfx"
# "${CMAKE_CURRENT_SOURCE_DIR}/sign/passphrase.txt"
# "http://timestamp.verisign.com/scripts/timestamp.dll")

# This is an example of how to create a cab
# -- uncomment lines below this to enable signing --
# -- uncomment lines below this to enable cab file creation --
#create_cab(${PLUGIN_NAME}
# ${CMAKE_CURRENT_SOURCE_DIR}/Win/Wix/@{PLUGIN_ident}.ddf
# ${CMAKE_CURRENT_SOURCE_DIR}/Win/Wix/@{PLUGIN_ident}.inf
# ${FB_BIN_DIR}/${PLUGIN_NAME}/${CMAKE_CFG_INTDIR}/
# ${PLUGIN_PATH}
# ${PROJECT_NAME}_WiXInstallExe
# )
2 changes: 1 addition & 1 deletion src/3rdParty/boost
Open in desktop
Submodule boost updated 1 files
+0 −50 boost/process.hpp