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

Fix more files for combined repos

Browse source
This commit is contained in:
Dan Stillman 2023-04-29 07:45:59 -04:00
parent 79ef3e3571
commit c326a6c971
6 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/mac/build-and-unify
View file

@ -2,8 +2,8 @@
set -e set -e
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ROOT_DIR="$(dirname "$SCRIPT_DIR")" APP_ROOT_DIR="$(dirname "$SCRIPT_DIR")"
. "$ROOT_DIR/config.sh" . "$APP_ROOT_DIR/config.sh"
fx_app_name=Firefox.app fx_app_name=Firefox.app
@ -15,17 +15,6 @@ fi
GECKO_PATH=$1 GECKO_PATH=$1
mach=$GECKO_PATH/mach mach=$GECKO_PATH/mach
# Set ZOTERO_REPOS_DIR to use directory other than $HOME for zotero-standalone-build
if [ -n "${ZOTERO_REPOS_DIR:-}" ]; then
repos_dir=$ZOTERO_REPOS_DIR
else
repos_dir=$HOME
fi
if [ ! -d "$repos_dir/zotero-standalone-build" ]; then
echo "$repos_dir/zotero-standalone-build not found" >&2
exit 1
fi
BUILD_DIR=`mktemp -d` BUILD_DIR=`mktemp -d`
function cleanup { function cleanup {
rm -rf $BUILD_DIR rm -rf $BUILD_DIR
@ -65,4 +54,4 @@ $mach python "$GECKO_PATH/toolkit/mozapps/installer/unify.py" x64/*.app aarch64/
cp x64/$fx_app_name/Contents/MacOS/firefox zotero cp x64/$fx_app_name/Contents/MacOS/firefox zotero
xz zotero xz zotero
mv zotero.xz "$repos_dir"/zotero-standalone-build/mac/zotero.xz mv zotero.xz "$APP_ROOT_DIR/mac/zotero.xz"

2
app/scripts/build_and_run
View file

@ -41,7 +41,7 @@ if [ $REBUILD -eq 1 ]; then
# Check if build watch is running # Check if build watch is running
# If not, run now # If not, run now
if ! ps u | grep scripts/build.js | grep -v grep > /dev/null; then if ! ps u | grep js-build/build.js | grep -v grep > /dev/null; then
echo "Running JS build process" echo "Running JS build process"
echo echo
cd $ROOT_DIR cd $ROOT_DIR

2
chrome.manifest
View file

@ -11,7 +11,7 @@ content zotero-platform-version chrome/content/zotero-platform/mac-big-sur/ os=D
resource zotero resource/ resource zotero resource/
# Keep in sync with locale.js and zotero-standalone-build:assets/multilocale.txt # Keep in sync with locale.js and app/assets/multilocale.txt
locale zotero en-US chrome/locale/en-US/zotero/ locale zotero en-US chrome/locale/en-US/zotero/
#locale zotero af-ZA chrome/locale/af-ZA/zotero/ #locale zotero af-ZA chrome/locale/af-ZA/zotero/
locale zotero ar chrome/locale/ar/zotero/ locale zotero ar chrome/locale/ar/zotero/

4
chrome/content/zotero/xpcom/locale.js
View file

@ -1,7 +1,7 @@
Zotero.Locale = { Zotero.Locale = {
/** /**
* Keep this up to date with zotero-standalone-build:assets/multilocale.txt, * Keep this up to date with app/assets/multilocale.txt,
* zotero-build/dictionaries/build-dictionaries, and possibly chrome.manifest * scripts/dictionaries/build-dictionaries, and possibly chrome.manifest
* *
* Names from https://addons.mozilla.org/en-US/firefox/language-tools/ * Names from https://addons.mozilla.org/en-US/firefox/language-tools/
*/ */

2
js-build/watch.js
View file

@ -12,7 +12,7 @@ const getSymlinks = require('./symlinks');
const ROOT = path.resolve(__dirname, '..'); const ROOT = path.resolve(__dirname, '..');
const addOmniExecPath = path.join(ROOT, '..', 'zotero-standalone-build', 'scripts', 'add_omni_file'); const addOmniExecPath = path.join(ROOT, 'app', 'scripts', 'add_omni_file');
let shouldAddOmni = false; let shouldAddOmni = false;
const source = [ const source = [

2
test/runtests.sh
View file

@ -156,7 +156,7 @@ trap "{ rm -rf \"$TEMPDIR\"; }" EXIT
# Check if build watch process is running # Check if build watch process is running
# If not, run now # If not, run now
if [[ -z "$CI" ]] && ! ps | grep scripts/build.js | grep -v grep > /dev/null; then if [[ -z "$CI" ]] && ! ps | grep js-build/build.js | grep -v grep > /dev/null; then
echo echo
echo "Running JS build process" echo "Running JS build process"
cd "$ROOT_DIR" cd "$ROOT_DIR"