mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Stop copying vcruntime140_1.dll in x64 build

Browse source 
Now bundled with Firefox in 115
This commit is contained in:
Dan Stillman 2024-04-06 16:12:38 -04:00
parent b3d07a5ddf
commit 13754fe32c
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/build.sh
View file

@ -650,11 +650,6 @@ if [ $BUILD_WIN == 1 ]; then
# Copy relevant assets from Firefox # Copy relevant assets from Firefox
cp -R "$runtime_path"/!(application.ini|browser|defaults|devtools-files|crashreporter*|firefox.exe|maintenanceservice*|precomplete|removed-files|uninstall|update*) "$APPDIR" cp -R "$runtime_path"/!(application.ini|browser|defaults|devtools-files|crashreporter*|firefox.exe|maintenanceservice*|precomplete|removed-files|uninstall|update*) "$APPDIR"
# Copy vcruntime140_1.dll
if [ $arch = "win-x64" ]; then
cp "$CALLDIR/xulrunner/vc-$arch/vcruntime140_1.dll" "$APPDIR"
fi
# Copy zotero.exe, which is built directly from Firefox source and then modified by # Copy zotero.exe, which is built directly from Firefox source and then modified by
# ResourceHacker to add icons # ResourceHacker to add icons
check_lfs_file "$CALLDIR/win/zotero.exe.tar.xz" check_lfs_file "$CALLDIR/win/zotero.exe.tar.xz"

7
app/scripts/check_requirements
View file

@ -78,13 +78,6 @@ if [ $platform = "w" ]; then
echo -n "Checking for 7z: " echo -n "Checking for 7z: "
which 7z || { $FAIL_CMD; FAILED=1; } which 7z || { $FAIL_CMD; FAILED=1; }
echo "Checking for vcruntime140_1.dll: "
for arch in win-x64; do
echo -n " xulrunner/vc-$arch/vcruntime140_1.dll "
[ -f "$APP_ROOT_DIR/xulrunner/vc-$arch/vcruntime140_1.dll" ] || { $FAIL_CMD; FAILED=1; }
done
echo
echo -n "Checking for rcedit: " echo -n "Checking for rcedit: "
which rcedit || { $FAIL_CMD; FAILED=1; echo " -- Install with fetch_rcedit"; } which rcedit || { $FAIL_CMD; FAILED=1; echo " -- Install with fetch_rcedit"; }
fi fi