diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh index 2b34da5124..6afc5d68ca 100755 --- a/browser_patches/checkout_build_archive_upload.sh +++ b/browser_patches/checkout_build_archive_upload.sh @@ -189,43 +189,43 @@ elif [[ "$BUILD_FLAVOR" == "firefox-win64" ]]; then # =============================== -# FIREFOX-STABLE COMPILATION +# FIREFOX-BETA COMPILATION # =============================== -elif [[ "$BUILD_FLAVOR" == "firefox-stable-ubuntu-18.04" ]]; then - BROWSER_NAME="firefox-stable" +elif [[ "$BUILD_FLAVOR" == "firefox-beta-ubuntu-18.04" ]]; then + BROWSER_NAME="firefox-beta" EXTRA_BUILD_ARGS="--full" EXPECTED_HOST_OS="Ubuntu" EXPECTED_HOST_OS_VERSION="18.04" - BUILD_BLOB_NAME="firefox-stable-ubuntu-18.04.zip" -elif [[ "$BUILD_FLAVOR" == "firefox-stable-ubuntu-20.04" ]]; then - BROWSER_NAME="firefox-stable" + BUILD_BLOB_NAME="firefox-beta-ubuntu-18.04.zip" +elif [[ "$BUILD_FLAVOR" == "firefox-beta-ubuntu-20.04" ]]; then + BROWSER_NAME="firefox-beta" EXTRA_BUILD_ARGS="--full" EXPECTED_HOST_OS="Ubuntu" EXPECTED_HOST_OS_VERSION="20.04" - BUILD_BLOB_NAME="firefox-stable-ubuntu-20.04.zip" -elif [[ "$BUILD_FLAVOR" == "firefox-stable-mac-10.14" ]]; then - BROWSER_NAME="firefox-stable" + BUILD_BLOB_NAME="firefox-beta-ubuntu-20.04.zip" +elif [[ "$BUILD_FLAVOR" == "firefox-beta-mac-10.14" ]]; then + BROWSER_NAME="firefox-beta" EXTRA_BUILD_ARGS="--full" EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS_VERSION="10.14" - BUILD_BLOB_NAME="firefox-stable-mac-10.14.zip" -elif [[ "$BUILD_FLAVOR" == "firefox-stable-mac-11.0-arm64" ]]; then - BROWSER_NAME="firefox-stable" + BUILD_BLOB_NAME="firefox-beta-mac-10.14.zip" +elif [[ "$BUILD_FLAVOR" == "firefox-beta-mac-11.0-arm64" ]]; then + BROWSER_NAME="firefox-beta" EXTRA_BUILD_ARGS="--full" EXPECTED_HOST_OS="Darwin" EXPECTED_HOST_OS_VERSION="11.0" EXPECTED_ARCH="arm64" - BUILD_BLOB_NAME="firefox-stable-mac-11.0-arm64.zip" -elif [[ "$BUILD_FLAVOR" == "firefox-stable-win32" ]]; then - BROWSER_NAME="firefox-stable" + BUILD_BLOB_NAME="firefox-beta-mac-11.0-arm64.zip" +elif [[ "$BUILD_FLAVOR" == "firefox-beta-win32" ]]; then + BROWSER_NAME="firefox-beta" EXTRA_BUILD_ARGS="--full" EXPECTED_HOST_OS="MINGW" - BUILD_BLOB_NAME="firefox-stable-win32.zip" -elif [[ "$BUILD_FLAVOR" == "firefox-stable-win64" ]]; then - BROWSER_NAME="firefox-stable" + BUILD_BLOB_NAME="firefox-beta-win32.zip" +elif [[ "$BUILD_FLAVOR" == "firefox-beta-win64" ]]; then + BROWSER_NAME="firefox-beta" EXTRA_BUILD_ARGS="--win64 --full" EXPECTED_HOST_OS="MINGW" - BUILD_BLOB_NAME="firefox-stable-win64.zip" + BUILD_BLOB_NAME="firefox-beta-win64.zip" # =========================== # WEBKIT COMPILATION diff --git a/browser_patches/export.sh b/browser_patches/export.sh index 3b34dc3324..7b8b4ef04e 100755 --- a/browser_patches/export.sh +++ b/browser_patches/export.sh @@ -53,16 +53,16 @@ if [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then CHECKOUT_PATH="${FF_CHECKOUT_PATH}" FRIENDLY_CHECKOUT_PATH="" fi -elif [[ ("$1" == "firefox-stable") || ("$1" == "ff-stable") ]]; then - # NOTE: firefox-stable re-uses firefox checkout. +elif [[ ("$1" == "firefox-beta") || ("$1" == "ff-beta") ]]; then + # NOTE: firefox-beta re-uses firefox checkout. FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout"; CHECKOUT_PATH="$PWD/firefox/checkout" - EXTRA_FOLDER_PW_PATH="$PWD/firefox-stable/juggler" + EXTRA_FOLDER_PW_PATH="$PWD/firefox-beta/juggler" EXTRA_FOLDER_CHECKOUT_RELPATH="juggler" - EXPORT_PATH="$PWD/firefox-stable" - BUILD_NUMBER_UPSTREAM_URL="https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/firefox-stable/BUILD_NUMBER" - source "./firefox-stable/UPSTREAM_CONFIG.sh" + EXPORT_PATH="$PWD/firefox-beta" + BUILD_NUMBER_UPSTREAM_URL="https://raw.githubusercontent.com/microsoft/playwright/master/browser_patches/firefox-beta/BUILD_NUMBER" + source "./firefox-beta/UPSTREAM_CONFIG.sh" if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then echo "WARNING: using checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}" CHECKOUT_PATH="${FF_CHECKOUT_PATH}" diff --git a/browser_patches/firefox-stable/.gitignore b/browser_patches/firefox-beta/.gitignore similarity index 100% rename from browser_patches/firefox-stable/.gitignore rename to browser_patches/firefox-beta/.gitignore diff --git a/browser_patches/firefox-beta/BUILD_NUMBER b/browser_patches/firefox-beta/BUILD_NUMBER new file mode 100644 index 0000000000..7234397788 --- /dev/null +++ b/browser_patches/firefox-beta/BUILD_NUMBER @@ -0,0 +1,2 @@ +1260 +Changed: lushnikov@chromium.org Mon Jun 7 16:40:07 PDT 2021 diff --git a/browser_patches/firefox-beta/EXPECTED_BUILDS b/browser_patches/firefox-beta/EXPECTED_BUILDS new file mode 100644 index 0000000000..a58b87bbf6 --- /dev/null +++ b/browser_patches/firefox-beta/EXPECTED_BUILDS @@ -0,0 +1,5 @@ +firefox-beta-mac-10.14.zip +firefox-beta-ubuntu-18.04.zip +firefox-beta-ubuntu-20.04.zip +firefox-beta-win32.zip +firefox-beta-win64.zip diff --git a/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh b/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh new file mode 100644 index 0000000000..ce173bc22b --- /dev/null +++ b/browser_patches/firefox-beta/UPSTREAM_CONFIG.sh @@ -0,0 +1,3 @@ +REMOTE_URL="https://github.com/mozilla/gecko-dev" +BASE_BRANCH="beta" +BASE_REVISION="d63e947e90d616f3188e0dcdfd7b8113340a18d5" diff --git a/browser_patches/firefox-stable/archive.sh b/browser_patches/firefox-beta/archive.sh similarity index 100% rename from browser_patches/firefox-stable/archive.sh rename to browser_patches/firefox-beta/archive.sh diff --git a/browser_patches/firefox-stable/build.sh b/browser_patches/firefox-beta/build.sh similarity index 100% rename from browser_patches/firefox-stable/build.sh rename to browser_patches/firefox-beta/build.sh diff --git a/browser_patches/firefox-stable/clean.sh b/browser_patches/firefox-beta/clean.sh similarity index 100% rename from browser_patches/firefox-stable/clean.sh rename to browser_patches/firefox-beta/clean.sh diff --git a/browser_patches/firefox-stable/install-preferences.js b/browser_patches/firefox-beta/install-preferences.js similarity index 100% rename from browser_patches/firefox-stable/install-preferences.js rename to browser_patches/firefox-beta/install-preferences.js diff --git a/browser_patches/firefox-stable/juggler/Helper.js b/browser_patches/firefox-beta/juggler/Helper.js similarity index 100% rename from browser_patches/firefox-stable/juggler/Helper.js rename to browser_patches/firefox-beta/juggler/Helper.js diff --git a/browser_patches/firefox-stable/juggler/NetworkObserver.js b/browser_patches/firefox-beta/juggler/NetworkObserver.js similarity index 100% rename from browser_patches/firefox-stable/juggler/NetworkObserver.js rename to browser_patches/firefox-beta/juggler/NetworkObserver.js diff --git a/browser_patches/firefox-stable/juggler/SimpleChannel.js b/browser_patches/firefox-beta/juggler/SimpleChannel.js similarity index 100% rename from browser_patches/firefox-stable/juggler/SimpleChannel.js rename to browser_patches/firefox-beta/juggler/SimpleChannel.js diff --git a/browser_patches/firefox-stable/juggler/TargetRegistry.js b/browser_patches/firefox-beta/juggler/TargetRegistry.js similarity index 100% rename from browser_patches/firefox-stable/juggler/TargetRegistry.js rename to browser_patches/firefox-beta/juggler/TargetRegistry.js diff --git a/browser_patches/firefox-stable/juggler/components/juggler.js b/browser_patches/firefox-beta/juggler/components/juggler.js similarity index 100% rename from browser_patches/firefox-stable/juggler/components/juggler.js rename to browser_patches/firefox-beta/juggler/components/juggler.js diff --git a/browser_patches/firefox-stable/juggler/components/juggler.manifest b/browser_patches/firefox-beta/juggler/components/juggler.manifest similarity index 100% rename from browser_patches/firefox-stable/juggler/components/juggler.manifest rename to browser_patches/firefox-beta/juggler/components/juggler.manifest diff --git a/browser_patches/firefox-stable/juggler/components/moz.build b/browser_patches/firefox-beta/juggler/components/moz.build similarity index 100% rename from browser_patches/firefox-stable/juggler/components/moz.build rename to browser_patches/firefox-beta/juggler/components/moz.build diff --git a/browser_patches/firefox-stable/juggler/content/FrameTree.js b/browser_patches/firefox-beta/juggler/content/FrameTree.js similarity index 100% rename from browser_patches/firefox-stable/juggler/content/FrameTree.js rename to browser_patches/firefox-beta/juggler/content/FrameTree.js diff --git a/browser_patches/firefox-stable/juggler/content/PageAgent.js b/browser_patches/firefox-beta/juggler/content/PageAgent.js similarity index 100% rename from browser_patches/firefox-stable/juggler/content/PageAgent.js rename to browser_patches/firefox-beta/juggler/content/PageAgent.js diff --git a/browser_patches/firefox-stable/juggler/content/Runtime.js b/browser_patches/firefox-beta/juggler/content/Runtime.js similarity index 100% rename from browser_patches/firefox-stable/juggler/content/Runtime.js rename to browser_patches/firefox-beta/juggler/content/Runtime.js diff --git a/browser_patches/firefox-stable/juggler/content/WorkerMain.js b/browser_patches/firefox-beta/juggler/content/WorkerMain.js similarity index 100% rename from browser_patches/firefox-stable/juggler/content/WorkerMain.js rename to browser_patches/firefox-beta/juggler/content/WorkerMain.js diff --git a/browser_patches/firefox-stable/juggler/content/hidden-scrollbars.css b/browser_patches/firefox-beta/juggler/content/hidden-scrollbars.css similarity index 100% rename from browser_patches/firefox-stable/juggler/content/hidden-scrollbars.css rename to browser_patches/firefox-beta/juggler/content/hidden-scrollbars.css diff --git a/browser_patches/firefox-stable/juggler/content/main.js b/browser_patches/firefox-beta/juggler/content/main.js similarity index 100% rename from browser_patches/firefox-stable/juggler/content/main.js rename to browser_patches/firefox-beta/juggler/content/main.js diff --git a/browser_patches/firefox-stable/juggler/jar.mn b/browser_patches/firefox-beta/juggler/jar.mn similarity index 100% rename from browser_patches/firefox-stable/juggler/jar.mn rename to browser_patches/firefox-beta/juggler/jar.mn diff --git a/browser_patches/firefox-stable/juggler/moz.build b/browser_patches/firefox-beta/juggler/moz.build similarity index 100% rename from browser_patches/firefox-stable/juggler/moz.build rename to browser_patches/firefox-beta/juggler/moz.build diff --git a/browser_patches/firefox-stable/juggler/pipe/components.conf b/browser_patches/firefox-beta/juggler/pipe/components.conf similarity index 100% rename from browser_patches/firefox-stable/juggler/pipe/components.conf rename to browser_patches/firefox-beta/juggler/pipe/components.conf diff --git a/browser_patches/firefox-stable/juggler/pipe/moz.build b/browser_patches/firefox-beta/juggler/pipe/moz.build similarity index 100% rename from browser_patches/firefox-stable/juggler/pipe/moz.build rename to browser_patches/firefox-beta/juggler/pipe/moz.build diff --git a/browser_patches/firefox-stable/juggler/pipe/nsIRemoteDebuggingPipe.idl b/browser_patches/firefox-beta/juggler/pipe/nsIRemoteDebuggingPipe.idl similarity index 100% rename from browser_patches/firefox-stable/juggler/pipe/nsIRemoteDebuggingPipe.idl rename to browser_patches/firefox-beta/juggler/pipe/nsIRemoteDebuggingPipe.idl diff --git a/browser_patches/firefox-stable/juggler/pipe/nsRemoteDebuggingPipe.cpp b/browser_patches/firefox-beta/juggler/pipe/nsRemoteDebuggingPipe.cpp similarity index 100% rename from browser_patches/firefox-stable/juggler/pipe/nsRemoteDebuggingPipe.cpp rename to browser_patches/firefox-beta/juggler/pipe/nsRemoteDebuggingPipe.cpp diff --git a/browser_patches/firefox-stable/juggler/pipe/nsRemoteDebuggingPipe.h b/browser_patches/firefox-beta/juggler/pipe/nsRemoteDebuggingPipe.h similarity index 100% rename from browser_patches/firefox-stable/juggler/pipe/nsRemoteDebuggingPipe.h rename to browser_patches/firefox-beta/juggler/pipe/nsRemoteDebuggingPipe.h diff --git a/browser_patches/firefox-stable/juggler/protocol/BrowserHandler.js b/browser_patches/firefox-beta/juggler/protocol/BrowserHandler.js similarity index 100% rename from browser_patches/firefox-stable/juggler/protocol/BrowserHandler.js rename to browser_patches/firefox-beta/juggler/protocol/BrowserHandler.js diff --git a/browser_patches/firefox-stable/juggler/protocol/Dispatcher.js b/browser_patches/firefox-beta/juggler/protocol/Dispatcher.js similarity index 100% rename from browser_patches/firefox-stable/juggler/protocol/Dispatcher.js rename to browser_patches/firefox-beta/juggler/protocol/Dispatcher.js diff --git a/browser_patches/firefox-stable/juggler/protocol/PageHandler.js b/browser_patches/firefox-beta/juggler/protocol/PageHandler.js similarity index 100% rename from browser_patches/firefox-stable/juggler/protocol/PageHandler.js rename to browser_patches/firefox-beta/juggler/protocol/PageHandler.js diff --git a/browser_patches/firefox-stable/juggler/protocol/PrimitiveTypes.js b/browser_patches/firefox-beta/juggler/protocol/PrimitiveTypes.js similarity index 100% rename from browser_patches/firefox-stable/juggler/protocol/PrimitiveTypes.js rename to browser_patches/firefox-beta/juggler/protocol/PrimitiveTypes.js diff --git a/browser_patches/firefox-stable/juggler/protocol/Protocol.js b/browser_patches/firefox-beta/juggler/protocol/Protocol.js similarity index 100% rename from browser_patches/firefox-stable/juggler/protocol/Protocol.js rename to browser_patches/firefox-beta/juggler/protocol/Protocol.js diff --git a/browser_patches/firefox-stable/juggler/screencast/HeadlessWindowCapturer.cpp b/browser_patches/firefox-beta/juggler/screencast/HeadlessWindowCapturer.cpp similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/HeadlessWindowCapturer.cpp rename to browser_patches/firefox-beta/juggler/screencast/HeadlessWindowCapturer.cpp diff --git a/browser_patches/firefox-stable/juggler/screencast/HeadlessWindowCapturer.h b/browser_patches/firefox-beta/juggler/screencast/HeadlessWindowCapturer.h similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/HeadlessWindowCapturer.h rename to browser_patches/firefox-beta/juggler/screencast/HeadlessWindowCapturer.h diff --git a/browser_patches/firefox-stable/juggler/screencast/ScreencastEncoder.cpp b/browser_patches/firefox-beta/juggler/screencast/ScreencastEncoder.cpp similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/ScreencastEncoder.cpp rename to browser_patches/firefox-beta/juggler/screencast/ScreencastEncoder.cpp diff --git a/browser_patches/firefox-stable/juggler/screencast/ScreencastEncoder.h b/browser_patches/firefox-beta/juggler/screencast/ScreencastEncoder.h similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/ScreencastEncoder.h rename to browser_patches/firefox-beta/juggler/screencast/ScreencastEncoder.h diff --git a/browser_patches/firefox-stable/juggler/screencast/WebMFileWriter.cpp b/browser_patches/firefox-beta/juggler/screencast/WebMFileWriter.cpp similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/WebMFileWriter.cpp rename to browser_patches/firefox-beta/juggler/screencast/WebMFileWriter.cpp diff --git a/browser_patches/firefox-stable/juggler/screencast/WebMFileWriter.h b/browser_patches/firefox-beta/juggler/screencast/WebMFileWriter.h similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/WebMFileWriter.h rename to browser_patches/firefox-beta/juggler/screencast/WebMFileWriter.h diff --git a/browser_patches/firefox-stable/juggler/screencast/components.conf b/browser_patches/firefox-beta/juggler/screencast/components.conf similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/components.conf rename to browser_patches/firefox-beta/juggler/screencast/components.conf diff --git a/browser_patches/firefox-stable/juggler/screencast/moz.build b/browser_patches/firefox-beta/juggler/screencast/moz.build similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/moz.build rename to browser_patches/firefox-beta/juggler/screencast/moz.build diff --git a/browser_patches/firefox-stable/juggler/screencast/nsIScreencastService.idl b/browser_patches/firefox-beta/juggler/screencast/nsIScreencastService.idl similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/nsIScreencastService.idl rename to browser_patches/firefox-beta/juggler/screencast/nsIScreencastService.idl diff --git a/browser_patches/firefox-stable/juggler/screencast/nsScreencastService.cpp b/browser_patches/firefox-beta/juggler/screencast/nsScreencastService.cpp similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/nsScreencastService.cpp rename to browser_patches/firefox-beta/juggler/screencast/nsScreencastService.cpp diff --git a/browser_patches/firefox-stable/juggler/screencast/nsScreencastService.h b/browser_patches/firefox-beta/juggler/screencast/nsScreencastService.h similarity index 100% rename from browser_patches/firefox-stable/juggler/screencast/nsScreencastService.h rename to browser_patches/firefox-beta/juggler/screencast/nsScreencastService.h diff --git a/browser_patches/firefox-stable/patches/bootstrap.diff b/browser_patches/firefox-beta/patches/bootstrap.diff similarity index 100% rename from browser_patches/firefox-stable/patches/bootstrap.diff rename to browser_patches/firefox-beta/patches/bootstrap.diff diff --git a/browser_patches/firefox-stable/preferences/00-playwright-prefs.js b/browser_patches/firefox-beta/preferences/00-playwright-prefs.js similarity index 100% rename from browser_patches/firefox-stable/preferences/00-playwright-prefs.js rename to browser_patches/firefox-beta/preferences/00-playwright-prefs.js diff --git a/browser_patches/firefox-stable/preferences/playwright.cfg b/browser_patches/firefox-beta/preferences/playwright.cfg similarity index 100% rename from browser_patches/firefox-stable/preferences/playwright.cfg rename to browser_patches/firefox-beta/preferences/playwright.cfg diff --git a/browser_patches/firefox-stable/BUILD_NUMBER b/browser_patches/firefox-stable/BUILD_NUMBER deleted file mode 100644 index 21ded5bf7c..0000000000 --- a/browser_patches/firefox-stable/BUILD_NUMBER +++ /dev/null @@ -1,2 +0,0 @@ -1259 -Changed: lushnikov@chromium.org Tue Jun 1 19:07:28 PDT 2021 diff --git a/browser_patches/firefox-stable/EXPECTED_BUILDS b/browser_patches/firefox-stable/EXPECTED_BUILDS deleted file mode 100644 index 64a6d4fc8f..0000000000 --- a/browser_patches/firefox-stable/EXPECTED_BUILDS +++ /dev/null @@ -1,5 +0,0 @@ -firefox-stable-mac-10.14.zip -firefox-stable-ubuntu-18.04.zip -firefox-stable-ubuntu-20.04.zip -firefox-stable-win32.zip -firefox-stable-win64.zip diff --git a/browser_patches/firefox-stable/UPSTREAM_CONFIG.sh b/browser_patches/firefox-stable/UPSTREAM_CONFIG.sh deleted file mode 100644 index 8c0e56daea..0000000000 --- a/browser_patches/firefox-stable/UPSTREAM_CONFIG.sh +++ /dev/null @@ -1,3 +0,0 @@ -REMOTE_URL="https://github.com/mozilla/gecko-dev" -BASE_BRANCH="release" -BASE_REVISION="3862f77749dd50e54c3d9eea32fb59e84d978c96" diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER index d9b2fa1c75..1a042c7c1b 100644 --- a/browser_patches/firefox/BUILD_NUMBER +++ b/browser_patches/firefox/BUILD_NUMBER @@ -1,2 +1,2 @@ -1268 -Changed: yurys@chromium.org Wed 26 May 2021 03:35:57 PM PDT +1269 +Changed: lushnikov@chromium.org Mon Jun 7 16:40:07 PDT 2021 diff --git a/browser_patches/firefox/UPSTREAM_CONFIG.sh b/browser_patches/firefox/UPSTREAM_CONFIG.sh index ce173bc22b..8c0e56daea 100644 --- a/browser_patches/firefox/UPSTREAM_CONFIG.sh +++ b/browser_patches/firefox/UPSTREAM_CONFIG.sh @@ -1,3 +1,3 @@ REMOTE_URL="https://github.com/mozilla/gecko-dev" -BASE_BRANCH="beta" -BASE_REVISION="d63e947e90d616f3188e0dcdfd7b8113340a18d5" +BASE_BRANCH="release" +BASE_REVISION="3862f77749dd50e54c3d9eea32fb59e84d978c96" diff --git a/browser_patches/prepare_checkout.sh b/browser_patches/prepare_checkout.sh index b28f116186..cdc278caf0 100755 --- a/browser_patches/prepare_checkout.sh +++ b/browser_patches/prepare_checkout.sh @@ -10,7 +10,7 @@ REMOTE_BROWSER_UPSTREAM="browser_upstream" BUILD_BRANCH="playwright-build" if [[ ($1 == '--help') || ($1 == '-h') ]]; then - echo "usage: $(basename $0) [firefox|firefox-stable|webkit] [custom_checkout_path]" + echo "usage: $(basename $0) [firefox|firefox-beta|webkit] [custom_checkout_path]" echo echo "Prepares browser checkout. The checkout is a GIT repository that:" echo "- has a '$REMOTE_BROWSER_UPSTREAM' remote pointing to a REMOTE_URL from UPSTREAM_CONFIG.sh" @@ -93,15 +93,15 @@ elif [[ ("$1" == "firefox") || ("$1" == "firefox/") || ("$1" == "ff") ]]; then CHECKOUT_PATH="${FF_CHECKOUT_PATH}" FRIENDLY_CHECKOUT_PATH="" fi -elif [[ ("$1" == "firefox-stable") || ("$1" == "ff-stable") ]]; then - # NOTE: firefox-stable re-uses firefox checkout. +elif [[ ("$1" == "firefox-beta") || ("$1" == "ff-beta") ]]; then + # NOTE: firefox-beta re-uses firefox checkout. FRIENDLY_CHECKOUT_PATH="//browser_patches/firefox/checkout"; CHECKOUT_PATH="$PWD/firefox/checkout" - PATCHES_PATH="$PWD/firefox-stable/patches" - FIREFOX_EXTRA_FOLDER_PATH="$PWD/firefox-stable/juggler" - BUILD_NUMBER=$(head -1 "$PWD/firefox-stable/BUILD_NUMBER") - source "./firefox-stable/UPSTREAM_CONFIG.sh" + PATCHES_PATH="$PWD/firefox-beta/patches" + FIREFOX_EXTRA_FOLDER_PATH="$PWD/firefox-beta/juggler" + BUILD_NUMBER=$(head -1 "$PWD/firefox-beta/BUILD_NUMBER") + source "./firefox-beta/UPSTREAM_CONFIG.sh" if [[ ! -z "${FF_CHECKOUT_PATH}" ]]; then echo "WARNING: using checkout path from FF_CHECKOUT_PATH env: ${FF_CHECKOUT_PATH}" CHECKOUT_PATH="${FF_CHECKOUT_PATH}"