wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-25 09:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

End FIREFOX_VERSION and use preprocessed values in bundled install.rdf files

Browse source
This commit is contained in:
NTD 2018-02-02 11:02:50 -05:00 • committed by Roy Tam
commit b20719e1c5
10 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
View file

@ -11,15 +11,15 @@
<Description about="urn:mozilla:install-manifest"> <Description about="urn:mozilla:install-manifest">
<em:id>{972ce4c6-7e08-4474-a285-3208198ce6fd}</em:id> <em:id>{972ce4c6-7e08-4474-a285-3208198ce6fd}</em:id>
<em:version>@FIREFOX_VERSION@</em:version> <em:version>@MOZ_APP_VERSION@</em:version>
<!-- Target Application this theme can install into, <!-- Target Application this theme can install into,
with minimum and maximum supported versions. --> with minimum and maximum supported versions. -->
<em:targetApplication> <em:targetApplication>
<Description> <Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <em:id>@MOZ_APP_ID@</em:id>
<em:minVersion>@FIREFOX_VERSION@</em:minVersion> <em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
<em:maxVersion>@FIREFOX_VERSION@</em:maxVersion> <em:maxVersion>@MOZ_APP_VERSION@</em:maxVersion>
</Description> </Description>
</em:targetApplication> </em:targetApplication>

3
browser/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/moz.build
View file

@ -4,6 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_APP_ID'] = CONFIG['MOZ_APP_ID']
FINAL_TARGET = 'dist/bin/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}' FINAL_TARGET = 'dist/bin/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}'
FINAL_TARGET_PP_FILES += [ FINAL_TARGET_PP_FILES += [

4
browser/confvars.sh
View file

@ -32,8 +32,8 @@ fi
# Enable building ./signmar and running libmar signature tests # Enable building ./signmar and running libmar signature tests
MOZ_ENABLE_SIGNMAR=1 MOZ_ENABLE_SIGNMAR=1
MOZ_APP_VERSION=$FIREFOX_VERSION MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
MOZ_EXTENSIONS_DEFAULT=" gio" MOZ_EXTENSIONS_DEFAULT=" gio"
# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
# MOZ_BRANDING_DIRECTORY is the default branding directory used when none is # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is

2
browser/installer/windows/moz.build
View file

@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION'] DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME'] DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']

1
mobile/android/config/version.txt Normal file
View file

@ -0,0 +1 @@
52.6.0

1
mobile/android/config/version_display.txt Normal file
View file

@ -0,0 +1 @@
52.6.0

4
mobile/android/confvars.sh
View file

@ -5,8 +5,8 @@
MOZ_APP_BASENAME=Fennec MOZ_APP_BASENAME=Fennec
MOZ_APP_VENDOR=Mozilla MOZ_APP_VENDOR=Mozilla
MOZ_APP_VERSION=$FIREFOX_VERSION MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
MOZ_APP_UA_NAME=Firefox MOZ_APP_UA_NAME=Firefox
MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial

6
mobile/android/extensions/flyweb/install.rdf.in
View file

@ -18,9 +18,9 @@
with minimum and maximum supported versions. --> with minimum and maximum supported versions. -->
<em:targetApplication> <em:targetApplication>
<Description> <Description>
<em:id>{aa3c5121-dab2-40e2-81ca-7ea25febc110}</em:id> <em:id>@MOZ_APP_ID@</em:id>
<em:minVersion>@FIREFOX_VERSION@</em:minVersion> <em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
<em:maxVersion>@FIREFOX_VERSION@</em:maxVersion> <em:maxVersion>@MOZ_APP_VERSION@</em:maxVersion>
</Description> </Description>
</em:targetApplication> </em:targetApplication>

3
mobile/android/extensions/flyweb/moz.build
View file

@ -4,6 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_APP_ID'] = CONFIG['MOZ_APP_ID']
FINAL_TARGET_FILES.features['flyweb@mozilla.org'] += [ FINAL_TARGET_FILES.features['flyweb@mozilla.org'] += [
'bootstrap.js' 'bootstrap.js'
] ]

14
old-configure.in
View file

@ -839,18 +839,6 @@ if test -z "$MOZILLA_VERSION"; then
AC_MSG_ERROR([failed to read version info from milestone file]) AC_MSG_ERROR([failed to read version info from milestone file])
fi fi
dnl Get version of various core apps from the version files.
FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt`
FIREFOX_VERSION_DISPLAY=`cat $_topsrcdir/browser/config/version_display.txt`
if test -z "$FIREFOX_VERSION"; then
AC_MSG_ERROR([FIREFOX_VERSION is unexpectedly blank.])
fi
if test -z "$FIREFOX_VERSION_DISPLAY"; then
AC_MSG_ERROR([FIREFOX_VERSION_DISPLAY is unexpectedly blank.])
fi
AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION") AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION) AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION") AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
@ -5483,8 +5471,6 @@ AC_DEFINE_UNQUOTED(MOZ_APP_UA_VERSION, "$MOZ_APP_VERSION")
AC_SUBST(MOZ_APP_VERSION) AC_SUBST(MOZ_APP_VERSION)
AC_SUBST(MOZ_APP_VERSION_DISPLAY) AC_SUBST(MOZ_APP_VERSION_DISPLAY)
AC_SUBST(MOZ_APP_MAXVERSION) AC_SUBST(MOZ_APP_MAXVERSION)
AC_DEFINE_UNQUOTED(FIREFOX_VERSION,$FIREFOX_VERSION)
AC_SUBST(FIREFOX_VERSION)
AC_SUBST(MOZ_UA_OS_AGNOSTIC) AC_SUBST(MOZ_UA_OS_AGNOSTIC)
if test -n "$MOZ_UA_OS_AGNOSTIC"; then if test -n "$MOZ_UA_OS_AGNOSTIC"; then
AC_DEFINE(MOZ_UA_OS_AGNOSTIC) AC_DEFINE(MOZ_UA_OS_AGNOSTIC)