Load integration manifest files only on correct platform

This commit is contained in:
Dan Stillman 2023-04-27 00:34:31 -04:00
parent a34a11b200
commit b6b6bbc3ee
2 changed files with 8 additions and 5 deletions

View file

@ -323,6 +323,7 @@ elif [ $BUILD_LINUX == 1 ]; then
fi fi
# Add word processor plug-ins # Add word processor plug-ins
echo >> chrome.manifest
if [ $BUILD_MAC == 1 ]; then if [ $BUILD_MAC == 1 ]; then
pluginDir="$CALLDIR/modules/zotero-word-for-mac-integration" pluginDir="$CALLDIR/modules/zotero-word-for-mac-integration"
mkdir -p "integration/word-for-mac" mkdir -p "integration/word-for-mac"
@ -336,6 +337,9 @@ if [ $BUILD_MAC == 1 ]; then
echo >> $prefs_file echo >> $prefs_file
cat "$CALLDIR/modules/zotero-word-for-mac-integration/defaults/preferences/zoteroMacWordIntegration.js" >> $prefs_file cat "$CALLDIR/modules/zotero-word-for-mac-integration/defaults/preferences/zoteroMacWordIntegration.js" >> $prefs_file
echo >> $prefs_file echo >> $prefs_file
echo "manifest integration/word-for-mac/chrome.manifest" >> chrome.manifest
elif [ $BUILD_WIN == 1 ]; then elif [ $BUILD_WIN == 1 ]; then
pluginDir="$CALLDIR/modules/zotero-word-for-windows-integration" pluginDir="$CALLDIR/modules/zotero-word-for-windows-integration"
mkdir -p "integration/word-for-windows" mkdir -p "integration/word-for-windows"
@ -349,6 +353,8 @@ elif [ $BUILD_WIN == 1 ]; then
echo >> $prefs_file echo >> $prefs_file
cat "$CALLDIR/modules/zotero-word-for-windows-integration/defaults/preferences/zoteroWinWordIntegration.js" >> $prefs_file cat "$CALLDIR/modules/zotero-word-for-windows-integration/defaults/preferences/zoteroWinWordIntegration.js" >> $prefs_file
echo >> $prefs_file echo >> $prefs_file
echo "manifest integration/word-for-windows/chrome.manifest" >> chrome.manifest
fi fi
# Libreoffice plugin for all platforms # Libreoffice plugin for all platforms
pluginDir="$CALLDIR/modules/zotero-libreoffice-integration" pluginDir="$CALLDIR/modules/zotero-libreoffice-integration"
@ -365,6 +371,8 @@ echo >> $prefs_file
cat "$CALLDIR/modules/zotero-libreoffice-integration/defaults/preferences/zoteroLibreOfficeIntegration.js" >> $prefs_file cat "$CALLDIR/modules/zotero-libreoffice-integration/defaults/preferences/zoteroLibreOfficeIntegration.js" >> $prefs_file
echo >> $prefs_file echo >> $prefs_file
echo "manifest integration/libreoffice/chrome.manifest" >> chrome.manifest
# Delete files that shouldn't be distributed # Delete files that shouldn't be distributed
find chrome -name .DS_Store -exec rm -f {} \; find chrome -name .DS_Store -exec rm -f {} \;

View file

@ -78,8 +78,3 @@ contract @mozilla.org/network/protocol;1?name=zotero {9BC3D762-9038-486A-9D70-C
content scaffold chrome/content/scaffold/ content scaffold chrome/content/scaffold/
locale scaffold en-US chrome/locale/en-US/scaffold/ locale scaffold en-US chrome/locale/en-US/scaffold/
skin scaffold default chrome/skin/default/scaffold/ skin scaffold default chrome/skin/default/scaffold/
# Word Plugins
manifest integration/libreoffice/chrome.manifest
manifest integration/word-for-windows/chrome.manifest
manifest integration/word-for-mac/chrome.manifest