From a49104795a3181fad396a2a4f126915975bb7e7b Mon Sep 17 00:00:00 2001 From: Peter Singer Date: Tue, 9 Apr 2013 22:05:50 +0200 Subject: [PATCH] Added ExQuilla, SyncKolab plugins, removed Test Pilot plugin, added calendar plugin extraction --- CLIENT_DATA/mozilla.cfg | 1 + CLIENT_DATA/setup32.ins | 3 ++- builder-product.cfg | 25 +++++++++++++------ builder-targets-cb.sh | 9 +++++++ ...illa-currentrelease-tb-windows.xpi.sha1sum | 1 + ...F-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum | 1 + 6 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 exquilla-currentrelease-tb-windows.xpi.sha1sum create mode 100644 {571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum diff --git a/CLIENT_DATA/mozilla.cfg b/CLIENT_DATA/mozilla.cfg index 1594996..b3f848e 100644 --- a/CLIENT_DATA/mozilla.cfg +++ b/CLIENT_DATA/mozilla.cfg @@ -4,3 +4,4 @@ lockPref("app.update.enabled", false); // lockPref("browser.search.update", false); pref("mail.root.imap-rel", "[ProfD]../../../../../Lokale Einstellungen/Thunderbird/ImapMail"); pref("mail.root.imap", "[ProfD]../../../../../Lokale Einstellungen/Thunderbird/ImapMail"); +// pref("extensions.checkUpdateSecurity", false); diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index a701a56..b0a65b9 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -86,7 +86,8 @@ REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 copy "$IniCfgFile$" "$InstallDir$" copy "%ScriptPath%\*.cfg" "$InstallDir$" copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" -copy -s "%ScriptPath%\X86\*.xpi" "$InstallDir$\distribution\extensions" +copy -s "%ScriptPath%\X86\Plugins\*.*" "$InstallDir$\distribution\extensions" +del "$InstallDir$\distribution\extensions\tbtestpilot@labs.mozilla.com.xpi" [Registry_install] ; Example of setting some values of an registry key: diff --git a/builder-product.cfg b/builder-product.cfg index b5c6f6b..4b284d5 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -24,39 +24,50 @@ DL_WINST_NAME[1]=InstallExe DL_FILE[2]="{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi" DL_SOURCE[2]="https://addons.cdn.mozilla.net/_files/_attachments/2313/lightning-1.9.1-sm+tb-windows.xpi" -DL_ARCH[2]="X86" +DL_ARCH[2]="X86/Plugins" DL_WINST_NAME[2]=LightningPluginXpi DL_FILE[3]="sogo-connector@inverse.ca.xpi" DL_SOURCE[3]="http://www.sogo.nu/files/downloads/extensions/sogo-connector-17.0.3.xpi" -DL_ARCH[3]="X86" +DL_ARCH[3]="X86/Plugins" DL_WINST_NAME[3]=SogoConnectorPluginXpi DL_FILE[4]="{847b3a00-7ab1-11d4-8f02-006008948af5}.xpi" DL_SOURCE[4]="https://addons.cdn.mozilla.net/_files/_attachments/71/enigmail-1.5.1-sm+tb.xpi" -DL_ARCH[4]="X86" +DL_ARCH[4]="X86/Plugins" DL_WINST_NAME[4]=EnigMailPluginXpi DL_FILE[5]="{2ab1b709-ba03-4361-abf9-c50b964ff75d}.xpi" DL_SOURCE[5]="https://addons.cdn.mozilla.net/_files/_attachments/611/signature_switch-1.6.11-tb.xpi" -DL_ARCH[5]="X86" +DL_ARCH[5]="X86/Plugins" DL_WINST_NAME[5]=SignatureSwitchPluginXpi DL_FILE[6]="{a300a000-5e21-4ee0-a115-9ec8f4eaa92b}.xpi" DL_SOURCE[6]="https://addons.cdn.mozilla.net/_files/_attachments/4654/remove_duplicate_messages_alternate-0.3.8b-tb.xpi" -DL_ARCH[6]="X86" +DL_ARCH[6]="X86/Plugins" DL_WINST_NAME[6]=RemoveDupMessagePluginXpi DL_FILE[7]="quickfolders@curious.be.xpi" DL_SOURCE[7]="https://addons.cdn.mozilla.net/_files/_attachments/3254/quickfolders_tabbed_folders-3.11-tb+sm.xpi" -DL_ARCH[7]="X86" +DL_ARCH[7]="X86/Plugins" DL_WINST_NAME[7]=QuickFolderPluginXpi DL_FILE[8]="{5e9999c2-ba1d-44b6-bcee-5b30ce37d3b0}.xpi" DL_SOURCE[8]="https://addons.cdn.mozilla.net/_files/_attachments/330424/printingtools-1.2.0.2-tb.xpi" -DL_ARCH[8]="X86" +DL_ARCH[8]="X86/Plugins" DL_WINST_NAME[8]=PrintingToolsPluginXpi +DL_FILE[9]="{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi" +DL_SOURCE[9]="http://www.gargan.org/extensions/synckolab-NIGHTLY.xpi" +DL_ARCH[9]="X86/Plugins" +DL_WINST_NAME[9]=SyncKolab-NIGHTLY + +DL_FILE[10]="exquilla-currentrelease-tb-windows.xpi" +DL_SOURCE[10]="http://mesquilla.net/exquilla-currentrelease-tb-windows.xpi" +DL_ARCH[10]="X86/Plugins" +DL_WINST_NAME[10]=Exquilla-Currentrelease + + OPSI_INI_SECTION[0]="X86" OPSI_INI_OPTION[0]="UninstallProg" OPSI_INI_VALUE[0]="uninstall\helper.exe" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 9a3d4a8..5bd9f81 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -23,3 +23,12 @@ function cleanup() { echo "Cleanup" builder_cleanup } + +function create() { + echo "Create" + builder_create + mkdir -p $INST_DIR/CLIENT_DATA/X86/Plugins/{{e2fda1a4-762b-4020-b5ad-a41df1933103},exquilla@mesquilla.com} + 7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/{e2fda1a4-762b-4020-b5ad-a41df1933103} $INST_DIR/CLIENT_DATA/X86/Plugins/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi + 7z x -o$INST_DIR/CLIENT_DATA/X86/Plugins/exquilla@mesquilla.com $INST_DIR/CLIENT_DATA/X86/Plugins/exquilla-currentrelease-tb-windows.xpi + +} diff --git a/exquilla-currentrelease-tb-windows.xpi.sha1sum b/exquilla-currentrelease-tb-windows.xpi.sha1sum new file mode 100644 index 0000000..3e5bc46 --- /dev/null +++ b/exquilla-currentrelease-tb-windows.xpi.sha1sum @@ -0,0 +1 @@ +1563ef80564d2cdc6bdcf862e24994948a310960 /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/exquilla-currentrelease-tb-windows.xpi diff --git a/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum b/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum new file mode 100644 index 0000000..d4ab855 --- /dev/null +++ b/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi.sha1sum @@ -0,0 +1 @@ +00020f88e3862a1b6804c564ee6550f51244bdae /home/opsiproducts/.opsi-dist-cache/mozilla.thunderbird-17.0.5/X86/{571CFACF-0F7D-49b4-BD77-E6FC7B209ADC}.xpi