mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-22 00:17:32 +09:00
Compare commits
3 commits
b5445fd195
...
2e313706f8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e313706f8 | ||
|
|
ca9cf2a080 | ||
|
|
b34a6b75fb |
22 changed files with 222 additions and 113 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -131,3 +131,6 @@ lextab.py
|
|||
|
||||
# tup database
|
||||
/.tup
|
||||
|
||||
# build script stuff
|
||||
.redist-stage-*
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
<assemblyIdentity
|
||||
version="1.0.0.0"
|
||||
processorArchitecture="*"
|
||||
name="Eclipse Hydra"
|
||||
name="Dactyloidae"
|
||||
type="win32"
|
||||
/>
|
||||
<description>Eclipse Hydra</description>
|
||||
<description>Dactyloidae</description>
|
||||
<dependency>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
WIN32_MODULE_COMPANYNAME=@MOZ_APP_VENDOR@
|
||||
WIN32_MODULE_COPYRIGHT=<3D>Dactyloidae Project, Eclipse Community, Basilisk and Mozilla Developers; available under the MPL 2 license.
|
||||
WIN32_MODULE_COPYRIGHT=<3D>Dactyloidae Project, Artemis Community, Basilisk and Mozilla Developers; available under the MPL 2 license.
|
||||
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
|
||||
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
|
||||
WIN32_MODULE_TRADEMARKS=The Dactyloidae logo and project names are trademarks of Eclipse Community and Dactyloidae Project.
|
||||
WIN32_MODULE_TRADEMARKS=The Dactyloidae logo and project names are trademarks of Artemis Community and Dactyloidae Project.
|
||||
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
|
||||
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@
|
||||
|
|
|
|||
|
|
@ -126,19 +126,19 @@
|
|||
#if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
|
||||
#ifdef MC_PRIVATE_BUILD
|
||||
<description class="text-blurb" id="communityDesc">
|
||||
This is a private build of Hydra. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="https://eclipse.cx/projects/hydra">Eclipse Community website</label>.
|
||||
This is a private build of Dactyloidae. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="https://dactyloidae.xyz/">Dactyloidae website</label>.
|
||||
</description>
|
||||
#else
|
||||
<description class="text-blurb" id="communityDesc">
|
||||
<label class="text-link" href="https://eclipse.cx/projects/hydra">&brandShorterName;</label> is community software released by <label class="text-link" href="https://eclipse.cx">&vendorShortName;</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software.
|
||||
<label class="text-link" href="https://dactyloidae.xyz/">&brandShorterName;</label> is community software released by <label class="text-link" href="https://dactyloidae.xyz/">&vendorShortName;</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software.
|
||||
</description>
|
||||
<description class="text-blurb" id="contributeDesc">
|
||||
If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://board.eclipse.cx/">&vendorShortName; forum</label> or getting involved in our development by tackling some of the issues found in our <label class="text-link" href="https://github.com/Eclipse-Community/UXP/">GitHub issue tracker</label>.
|
||||
If you wish to contribute, please consider helping out by getting involved in our development by tackling some of the issues found in our <label class="text-link" href="https://repo.dactyloidae.xyz/Dactyloidae/UXP/issues">issue tracker</label>.
|
||||
</description>
|
||||
#endif
|
||||
#else
|
||||
<description class="text-blurb" id="communityDesc">
|
||||
Dactyloidae is released by <label class="text-link" href="https://eclipse.cx">Eclipse Community</label>.
|
||||
Dactyloidae is released by <label class="text-link" href="https://dactyloidae.xyz/">Dactyloidae Team</label>.
|
||||
</description>
|
||||
|
||||
<description class="text-blurb">
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
</description>
|
||||
|
||||
<description class="text-blurb" id="contributeDesc">
|
||||
If you wish to contribute, please consider helping out by getting involved in our development by tackling some of the issues found in our <label class="text-link" href="https://github.com/Eclipse-Community/Dactyloidae/">GitHub issue tracker</label>.
|
||||
If you wish to contribute, please consider helping out by getting involved in our development by tackling some of the issues found in our <label class="text-link" href="https://repo.dactyloidae.xyz/Dactyloidae/UXP/issues">issue tracker</label>.
|
||||
</description>
|
||||
#endif
|
||||
</vbox>
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
- 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/. -->
|
||||
<p><b>Binaries</b> of this product have been made available to you by
|
||||
<a href="http://eclipse.cx/">Eclipse Community</a> under the Mozilla
|
||||
<a href="https://dactyloidae.xyz/">Dactyloidae Team</a> under the Mozilla
|
||||
Public License 2.0 (MPL). <a href="about:rights">Know your rights</a>.</p>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# BrandFullNameInternal is used for some registry and file system values
|
||||
# instead of BrandFullName and typically should not be modified.
|
||||
!define BrandFullNameInternal "Dactyloidae"
|
||||
!define CompanyName "Eclipse Community"
|
||||
!define CompanyName "Dactyloidae"
|
||||
!define URLInfoAbout "about:blank"
|
||||
!define URLUpdateInfo "about:blank"
|
||||
!define HelpLink "about:blank"
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@ MOZ_APP_DISPLAYNAME="Dactyloidae"
|
|||
|
||||
MOZ_APP_UA_NAME="Dactyloidae"
|
||||
|
||||
MOZ_APP_VENDOR="Eclipse Community"
|
||||
MOZ_APP_VENDOR="Dactyloidae"
|
||||
|
||||
MOZ_APP_FULLNAME="Dactyloidae"
|
||||
|
||||
MOZ_APP_PROFILE="Eclipse Community/Dactyloidae"
|
||||
MOZ_APP_PROFILE="Dactyloidae"
|
||||
|
||||
MOZ_APP_REMOTINGNAME=com.Eclipse Community.Dactyloidae
|
||||
MOZ_APP_REMOTINGNAME=com.Dactyloidae
|
||||
|
||||
MOZ_DISTRIBUTION_ID=com.opensource
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
<!ENTITY brandShorterName "Dactyloidae">
|
||||
<!ENTITY brandShortName "Dactyloidae">
|
||||
<!ENTITY brandFullName "Dactyloidae">
|
||||
<!ENTITY vendorShortName "Eclipse Community">
|
||||
<!ENTITY vendorFullName "Eclipse Community">
|
||||
<!ENTITY trademarkInfo.part1 "Dactyloidae and the Dactyloidae logo are trademarks of Eclipse Community.">
|
||||
<!ENTITY vendorShortName "Dactyloidae">
|
||||
<!ENTITY vendorFullName "Dactyloidae">
|
||||
<!ENTITY trademarkInfo.part1 "Dactyloidae and the Dactyloidae logo are trademarks of Dactyloidae Team.">
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
brandShorterName=Dactyloidae
|
||||
brandShortName=Dactyloidae
|
||||
brandFullName=Dactyloidae
|
||||
vendorShortName=Eclipse Community
|
||||
vendorFullName=Eclipse Community
|
||||
vendorShortName=Dactyloidae
|
||||
vendorFullName=Dactyloidae
|
||||
|
||||
syncBrandShortName=Sync
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# 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/.
|
||||
|
||||
MOZ_APP_BASENAME=Hydra
|
||||
MOZ_APP_VENDOR="Eclipse Community"
|
||||
MOZ_APP_BASENAME=Dactyloidae
|
||||
MOZ_APP_VENDOR="Dactyloidae"
|
||||
MOZ_PHOENIX=1
|
||||
MOZ_AUSTRALIS=1
|
||||
MC_BASILISK=1
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@
|
|||
@BINPATH@/@MSVC_C_RUNTIME_DLL@
|
||||
@BINPATH@/@MSVC_CMP_RUNTIME_DLL@
|
||||
@BINPATH@/@MSVC_CXX_RUNTIME_DLL@
|
||||
@BINPATH@/concrt140.dll
|
||||
#endif
|
||||
#if MOZ_PACKAGE_WIN_UCRT_DLLS
|
||||
@BINPATH@/api-ms-win-*.dll
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;!@Install@!UTF-8!
|
||||
Title="Hydra"
|
||||
Title="Dactyloidae"
|
||||
RunProgram="setup.exe"
|
||||
;!@InstallEnd@!
|
||||
|
|
@ -1,8 +1,4 @@
|
|||
#filter substitution
|
||||
|
||||
#define eclipse_icon data:image/png;base64,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
|
||||
|
||||
#define github_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAHdSURBVHgBvVeLbYNADDVdoHSDG4ENwgjpBMkG6QbtBkknIBtEnaDdADoBbEA6gWuXQ3GR7wOc8qSnSPhvkzuTQSQQMaefLXFDLIiGmFvxldgRG+IX8SPLsiukAAU2xDOxx3mo2BaWgismHnE9jrZ7s6tuMR1ajO0GKRaYNrhMorh35VoSBjwzbxWDCy5Lil/ailgrPnMtAe2F2wn5Hm+J9Nbxp2AvZNKuVPwetdZrKJQuGfCPMI/0baTSOai0EJ4EKlmVC3tYCdRHwOBR5Q8wHK8aOhiO1bVorK8phqPd0/4dJIKnCxULa4dw3vEZTkK7S2oegVH0u2S3mfCpPDOcQNJKPdAK+nsJ7wW10Ixn4xA+pRwDD1x5fOUOdA6bDaQLXjpEHSfw7RC+QDrsHc+b8ZJxYXUS5OPg8b8bj2LfvvcKCxEIzshHRXkavhG3+H8HaK2zMiJoYXXrQPBKGplJsK3tjObk4gl+wXiYqfFJCHublLailZ4EysjgJ814upKdRHc4uYp4gPAIQmjRdc8oFRcwExHBjdTPFAcclOc8Kp5huNN/iI90Or5DIAGHqCM+k30DEVU41/MI26jKo4DDX3JtAidcs1vg7eM0NoEeb98EBlIBAyu50DNzKv4F8Mg9kvfoSM0AAAAASUVORK5CYII=
|
||||
#include ../../@AB_CD@/profile/bookmarks.inc
|
||||
#define ja_jp_mac ja-JP-mac
|
||||
#if AB_CD == ja_jp_mac
|
||||
|
|
@ -21,6 +17,6 @@
|
|||
<dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt>
|
||||
<dd>@bookmarks_toolbarfolder_description@
|
||||
<dl><p>
|
||||
<dt><a href="https://github.com/Eclipse-Community/Dactyloidae/issues" icon="@github_icon@">Report Issues</a></dt>
|
||||
<dt><a href="https://repo.dactyloidae.xyz/Dactyloidae/UXP/issues" >Report Issues</a></dt>
|
||||
</dl><p>
|
||||
</dl>
|
||||
|
|
|
|||
97
build-msvc-win
Normal file
97
build-msvc-win
Normal file
|
|
@ -0,0 +1,97 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
win_to_msys() {
|
||||
echo "$1" | sed 's|\\|/|g; s|^\([A-Za-z]\):/|/\1/|' | tr 'A-Z' 'a-z' | sed 's|^/\([a-z]\)/|\1:/|; s|^\([a-z]\):/|/\1/|'
|
||||
}
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
case "$BUILD_ARCH" in
|
||||
x64) MOZCONFIG_NAME="uxp-win64-msvc" ; REDIST_ARCH="x64" ;;
|
||||
x86) MOZCONFIG_NAME="uxp-win32-msvc" ; REDIST_ARCH="x86" ;;
|
||||
*)
|
||||
echo "[build] BUILD_ARCH is not set or not x64/x86, Make sure you run the dactyl msvc shell first."
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
MOZCONFIG_SRC="$SCRIPT_DIR/mozconfigs/windows/$MOZCONFIG_NAME"
|
||||
MOZCONFIG_DST="$SCRIPT_DIR/.mozconfig"
|
||||
if [ ! -f "$MOZCONFIG_SRC" ]; then
|
||||
echo "[build] ERROR: Mozconfig not found: $MOZCONFIG_SRC"
|
||||
exit 1
|
||||
fi
|
||||
echo "[build] Architecture : $BUILD_ARCH"
|
||||
echo "[build] Mozconfig : mozconfigs/windows/$MOZCONFIG_NAME"
|
||||
cp "$MOZCONFIG_SRC" "$MOZCONFIG_DST"
|
||||
echo "[build] Copied to : .mozconfig"
|
||||
|
||||
|
||||
if [ -z "$VCINSTALLDIR" ]; then
|
||||
echo "[build] ERROR: VCINSTALLDIR is not set. Make sure you run the dactyl msvc shell first."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
REDIST_BASE="$(win_to_msys "$VCINSTALLDIR")/Redist/MSVC"
|
||||
echo "[build] VC install : $VCINSTALLDIR"
|
||||
|
||||
if [ ! -d "$REDIST_BASE" ]; then
|
||||
echo "[build] ERROR: VC redist not found at $REDIST_BASE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
REDIST_VER=""
|
||||
for DIR in "$REDIST_BASE"/14.16.*; do
|
||||
[ -d "$DIR" ] && REDIST_VER="$DIR" && break
|
||||
done
|
||||
|
||||
if [ -z "$REDIST_VER" ]; then
|
||||
echo "[build] ERROR: No VS2017 redist found under $REDIST_BASE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
STAGING_DIR="$SCRIPT_DIR/.redist-stage-$REDIST_ARCH"
|
||||
mkdir -p "$STAGING_DIR"
|
||||
|
||||
for SUBDIR in Microsoft.VC141.CRT Microsoft.VC141.OPENMP; do
|
||||
SRC="$REDIST_VER/$REDIST_ARCH/$SUBDIR"
|
||||
if [ -d "$SRC" ]; then
|
||||
echo "[build] <- $SUBDIR"
|
||||
cp -u "$SRC"/*.dll "$STAGING_DIR/"
|
||||
else
|
||||
echo "[build] WARNING: Redist Dlls not found, skipping."
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$UNIVERSALCRTSDKDIR" ]; then
|
||||
echo "[build] ERROR: CRT SDK Dir ENV is not set. Make sure you run the dactyl msvc shell first."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
UCRT_DIR="$(win_to_msys "$UNIVERSALCRTSDKDIR")/Redist/ucrt/DLLs/$REDIST_ARCH"
|
||||
if [ -d "$UCRT_DIR" ]; then
|
||||
echo "[build] <- ucrt ($UCRT_DIR)"
|
||||
cp -u "$UCRT_DIR"/*.dll "$STAGING_DIR/"
|
||||
else
|
||||
echo "[build] WARNING: UCRT redist not found at $UCRT_DIR"
|
||||
fi
|
||||
|
||||
# workaround: Default ucrtbase doesnt work on Windows 2000 for some reason but newer does.
|
||||
UCRT19041_FILE="$(win_to_msys "$UNIVERSALCRTSDKDIR")/Redist/10.0.19041.0/ucrt/DLLs/$REDIST_ARCH/ucrtbase.dll"
|
||||
if [ -f "$UCRT19041_FILE" ]; then
|
||||
echo "[build] 19041 ucrtbase applied"
|
||||
cp -u "$UCRT19041_FILE" "$STAGING_DIR/"
|
||||
else
|
||||
echo "[build] WARNING: 19041 ucrtbase not found for Windows 2000 Compat"
|
||||
fi
|
||||
|
||||
export WIN32_REDIST_DIR="$STAGING_DIR"
|
||||
export WIN_UCRT_REDIST_DIR="$STAGING_DIR"
|
||||
|
||||
echo "[build] Starting build..."
|
||||
./mach build
|
||||
case "$BUILD_ARCH" in
|
||||
x64) OBJ_DIR="obj-x86_64-pc-mingw32" ;;
|
||||
x86) OBJ_DIR="obj-i686-pc-mingw32" ;;
|
||||
esac
|
||||
cp "$STAGING_DIR/concrt140.dll" "$SCRIPT_DIR/$OBJ_DIR/dist/bin/"
|
||||
42
docs/build/windows.md
vendored
42
docs/build/windows.md
vendored
|
|
@ -1,37 +1,29 @@
|
|||
# How to compile Dactyloidae (as of version 13.2)
|
||||
# How to compile Dactyloidae
|
||||
|
||||
Step 0. INSTALL GIT FOR WINDOWS!!!!!
|
||||
Step 1. Install Git for Windows (win7 users should install 2.46.2)
|
||||
|
||||
Step 1. If you are on Windows 8.1 or older, mount your installation media.
|
||||
Step 2. Enable .NET 3.5 in optionalfeatures.exe\
|
||||
NOTE: Win8 users may need to use this https://github.com/abbodi1406/dotNetFx35W81
|
||||
|
||||
Step 2. Go Win+R and type 'optionalfeatures.exe' and check .NET 3.5
|
||||
Step 3. Install VS 2019 Community with Desktop Developement with C++ and "C++ Windows XP Support for VS 2017 (v141)\
|
||||
and MSVC v141 - VS 2017 C++ x64/x86 build tools (v14.16)\
|
||||
Make sure you also get 10.0.19041 sdk
|
||||
|
||||
Step 3. Get the DirectX SDK (June 2010) from HERE: https://archive.org/details/dxsdk_jun10
|
||||
Step 4. Get the DirectX SDK https://www.microsoft.com/en-us/download/details.aspx?id=6812\
|
||||
(NOTE if you get a S2023 error in the end you can safely ignore it)
|
||||
|
||||
Step 4. After that has installed, get MozillaBuild 3.2 from HERE: https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-3.2.exe
|
||||
Step 5. Get and Install MozillaBuild from here https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-3.2.exe
|
||||
|
||||
Step 5. After THAT has installed, you can commence onto installing the FWDK. First, get the .7z HERE: https://archive.org/details/funny-windows-development-kit
|
||||
Step 6. Copy shell-msvc-dactyl.bat from docs folder to your mozilla-build directory (usually at C:\mozilla-build)
|
||||
|
||||
Step 6. Extract the FWDK to C:\Dev
|
||||
Step 7. Run shell-msvc-dactyl.bat from the mozilla-build directory.
|
||||
|
||||
Step 7. Move the start-shell-ewdk and start-shell-ewdk-x64 from this folder into c:\mozilla-build.
|
||||
Step 8. Select the architecture that you want to build Dactyloidae for
|
||||
|
||||
Step 8. Now that you have done all those prerequisites, open your start-shell-ewdk (64 if you want to build a 64 bit browser)
|
||||
Step 9. CD to the Repo (msys uses unix style dirs, c:\ is /c/ for example)
|
||||
|
||||
Step 9. Git clone this repo if you have not already
|
||||
Step 10. Run ./build-msvc-win
|
||||
|
||||
Step 10. CD into the directory of where your git clone is, and execute THESE commands:
|
||||
Step 10.5. After the build, if you really feel fancy, you can test your build before packaging it with ``./mach run``
|
||||
|
||||
``git config core.autocrlf false``
|
||||
|
||||
``git config core.eof lf``
|
||||
|
||||
``git rm --cached -r .``
|
||||
|
||||
``git reset --hard``
|
||||
|
||||
Step 11. Now that you have FINALLY done all those, you are now free to do a ``./mach build`` (isn't mozillabuild fun?)
|
||||
|
||||
Step 11.5. After the build, if you really feel fancy, you can test your build before packaging it with ``./mach run``
|
||||
|
||||
Step 12. Run ``./mach installer `` (64-bit only for now, sorry)
|
||||
Step 11. Run ``./mach installer`` (if you want to build an installer)
|
||||
|
|
|
|||
73
docs/shell-msvc-dactyl.bat
Normal file
73
docs/shell-msvc-dactyl.bat
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
@ECHO OFF
|
||||
|
||||
SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
|
||||
|
||||
SET CYGWIN=
|
||||
SET INCLUDE=
|
||||
SET LIB=
|
||||
IF NOT DEFINED MOZ_NO_RESET_PATH (
|
||||
SET PATH=%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SystemRoot%\System32\WindowsPowerShell\v1.0
|
||||
)
|
||||
|
||||
|
||||
SET MOZILLABUILD=%~dp0
|
||||
|
||||
SET WINCURVERKEY=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion
|
||||
REG QUERY "%WINCURVERKEY%" /v "ProgramFilesDir (x86)" >nul 2>nul
|
||||
IF NOT ERRORLEVEL 1 (
|
||||
SET WIN64=1
|
||||
) ELSE (
|
||||
SET WIN64=0
|
||||
)
|
||||
|
||||
SET BUILD_ARCH=
|
||||
:ASK_ARCH
|
||||
ECHO.
|
||||
ECHO What architecture will you build for?
|
||||
ECHO [1] 64-bit
|
||||
ECHO [2] 32-bit
|
||||
ECHO.
|
||||
SET /P ARCH_CHOICE="Enter 1 or 2: "
|
||||
|
||||
IF "!ARCH_CHOICE!" == "1" (
|
||||
SET BUILD_ARCH=x64
|
||||
) ELSE IF "!ARCH_CHOICE!" == "2" (
|
||||
SET BUILD_ARCH=x86
|
||||
) ELSE (
|
||||
ECHO Invalid choice. Please enter 1 or 2.
|
||||
GOTO :ASK_ARCH
|
||||
)
|
||||
|
||||
ECHO Target architecture: !BUILD_ARCH!
|
||||
SET VCVARSALL=
|
||||
SET VS2019_BASE=%ProgramFiles(x86)%\Microsoft Visual Studio\2019
|
||||
|
||||
IF EXIST "!VS2019_BASE!\Community\VC\Auxiliary\Build\vcvarsall.bat" (
|
||||
SET VCVARSALL=!VS2019_BASE!\Community\VC\Auxiliary\Build\vcvarsall.bat
|
||||
SET VS2019_EDITION=Community
|
||||
) ELSE IF EXIST "!VS2019_BASE!\Professional\VC\Auxiliary\Build\vcvarsall.bat" (
|
||||
SET VCVARSALL=!VS2019_BASE!\Professional\VC\Auxiliary\Build\vcvarsall.bat
|
||||
SET VS2019_EDITION=Professional
|
||||
) ELSE IF EXIST "!VS2019_BASE!\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" (
|
||||
SET VCVARSALL=!VS2019_BASE!\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
|
||||
SET VS2019_EDITION=Enterprise
|
||||
) ELSE IF EXIST "!VS2019_BASE!\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" (
|
||||
SET VCVARSALL=!VS2019_BASE!\BuildTools\VC\Auxiliary\Build\vcvarsall.bat
|
||||
SET VS2019_EDITION=BuildTools
|
||||
)
|
||||
|
||||
CALL "!VCVARSALL!" !BUILD_ARCH! -vcvars_ver=14.16
|
||||
IF ERRORLEVEL 1 (
|
||||
ECHO vcvarsall.bat failed.
|
||||
ECHO Ensure the v141 + v141 xp toolset is installed via the
|
||||
ECHO VS 2019 installer ^(Individual components tab^).
|
||||
pause
|
||||
exit
|
||||
)
|
||||
ECHO Build environment ready.
|
||||
|
||||
REM ============================================================
|
||||
REM Launch shell
|
||||
REM ============================================================
|
||||
START %MOZILLABUILD%msys\bin\mintty -e %MOZILLABUILD%msys\bin\console %MOZILLABUILD%msys\bin\bash --login
|
||||
EXIT /B
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
@ECHO OFF
|
||||
SET MOZ_MSVCBITS=64
|
||||
SET MOZ_MSVCVERSION=14
|
||||
SET MOZ_MSVCYEAR=2017
|
||||
SET VCDIR=C:\DEV\MSVC14\
|
||||
SET TOOLCHAIN=64-bit
|
||||
SET MOZILLABUILD=%~dp0
|
||||
SET MOZ_TOOLS=%MOZILLABUILD%moztools
|
||||
SET VSINSTALLDIR=C:\DEV\MSVC14
|
||||
SET VCINSTALLDIR=C:\DEV\MSVC14
|
||||
SET FrameworkDir32=C:\Windows\Microsoft.NET\Framework\
|
||||
SET FrameworkVersion32=v4.0.30319
|
||||
SET Framework40Version=v4.0.30319
|
||||
SET UCRTVersion=10.0.19041.0
|
||||
SET WindowsSDKLibVersion=10.0.19041.0\
|
||||
SET INCLUDE=C:\Dev\MSVC14\include;C:\Dev\MSVC14\atlmfc\include;C:\Dev\Windows Kits\10\include\shared;C:\Dev\Windows Kits\10\include\10.0.19041.0\um;C:\Dev\Windows Kits\10\include\10.0.19041.0\winrt;C:\Dev\Windows Kits\10\include\10.0.19041.0\ucrt;
|
||||
SET LIB=C:\Dev\MSVC14\lib\x64;C:\Dev\MSVC14\atlmfc\lib\x64;C:\Dev\Windows Kits\10\lib\10.0.19041.0\um\x64;C:\Dev\Windows Kits\10\lib\10.0.19041.0\ucrt\x64;
|
||||
SET LIBPATH=C:\Dev\MSVC14\lib\x64;C:\Dev\MSVC14\atlmfc\lib\x64;C:\Dev\Windows Kits\10\lib\10.0.19041.0\ucrt\x64;
|
||||
SET PATH=C:\Dev\MSVC14\bin\Hostx64\x64;C:\Dev\MSVC14\bin\Hostx64\x64;C:\Dev\Windows Kits\10\bin\10.0.19041.0\x64;%PATH%
|
||||
|
||||
SET SDKDIR=C:\Dev\Windows Kits\10\
|
||||
SET WINDOWSSDKDIR=C:\Dev\Windows Kits\10\
|
||||
set "UCRTContentRoot=%WDKContentRoot%"
|
||||
set "UniversalCRTSdkDir=%WDKContentRoot%"
|
||||
START %MOZILLABUILD%msys\bin\mintty -e %MOZILLABUILD%msys\bin\console %MOZILLABUILD%msys\bin\bash --login
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
@ECHO OFF
|
||||
SET MOZ_MSVCBITS=32
|
||||
SET MOZ_MSVCVERSION=14
|
||||
SET MOZ_MSVCYEAR=2017
|
||||
SET VCDIR=C:\DEV\MSVC14\
|
||||
SET TOOLCHAIN=32-bit
|
||||
SET MOZILLABUILD=%~dp0
|
||||
SET MOZ_TOOLS=%MOZILLABUILD%moztools
|
||||
SET VSINSTALLDIR=C:\DEV\MSVC14
|
||||
SET VCINSTALLDIR=C:\DEV\MSVC14
|
||||
SET FrameworkDir32=C:\Windows\Microsoft.NET\Framework\
|
||||
SET FrameworkVersion32=v4.0.30319
|
||||
SET Framework40Version=v4.0.30319
|
||||
SET UCRTVersion=10.0.19041.0
|
||||
SET WindowsSDKLibVersion=10.0.19041.0\
|
||||
SET INCLUDE=C:\Dev\MSVC14\include;C:\Dev\MSVC14\atlmfc\include;C:\Dev\Windows Kits\10\include\shared;C:\Dev\Windows Kits\10\include\10.0.19041.0\um;C:\Dev\Windows Kits\10\include\10.0.19041.0\winrt;C:\Dev\Windows Kits\10\include\10.0.19041.0\ucrt;
|
||||
SET LIB=C:\Dev\MSVC14\lib\x86;C:\Dev\MSVC14\atlmfc\lib\x86;C:\Dev\Windows Kits\10\lib\10.0.19041.0\um\x86;C:\Dev\Windows Kits\10\lib\10.0.19041.0\ucrt\x86;
|
||||
SET LIBPATH=C:\Dev\MSVC14\lib\x86;C:\Dev\MSVC14\atlmfc\lib\x86;C:\Dev\Windows Kits\10\lib\10.0.19041.0\ucrt\x86;
|
||||
SET PATH=C:\Dev\MSVC14\bin\Hostx64\x86;C:\Dev\MSVC14\bin\Hostx64\x64;C:\Dev\Windows Kits\10\bin\10.0.19041.0\x86;%PATH%
|
||||
|
||||
SET SDKDIR=C:\Dev\Windows Kits\10\
|
||||
SET WINDOWSSDKDIR=C:\Dev\Windows Kits\10\
|
||||
set "UCRTContentRoot=%WDKContentRoot%"
|
||||
set "UniversalCRTSdkDir=%WDKContentRoot%"
|
||||
START %MOZILLABUILD%msys\bin\mintty -e %MOZILLABUILD%msys\bin\console %MOZILLABUILD%msys\bin\bash --login
|
||||
|
|
@ -2,14 +2,12 @@
|
|||
|
||||
##Uncomment PGO for release build
|
||||
|
||||
# 16 jobs for 16 cores
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j6"
|
||||
# auto detect threads
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
|
||||
|
||||
# x86 build
|
||||
ac_add_options --host=i686-pc-mingw32
|
||||
ac_add_options --target=i686-pc-mingw32
|
||||
WIN32_REDIST_DIR=$VCINSTALLDIR/Redist/MSVC/14.16.27012/x86
|
||||
WIN_UCRT_REDIST_DIR=$WINDOWSSDKDIR/Redist/10.0.19041.0/ucrt/DLLs/r86
|
||||
|
||||
# Force compiler + linker + tools
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@
|
|||
|
||||
##Uncomment PGO for release build
|
||||
|
||||
# 16 jobs for 16 cores
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j6"
|
||||
# auto detect threads
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
|
||||
|
||||
# x86 build
|
||||
ac_add_options --host=i686-pc-mingw32
|
||||
ac_add_options --target=i686-pc-mingw32
|
||||
WIN32_REDIST_DIR=$VCINSTALLDIR/Redist/MSVC/14.16.27012/x86
|
||||
|
||||
# Build only Hydra
|
||||
ac_add_options --enable-application=basilisk
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ export PATH="$CLANG:$PATH"
|
|||
|
||||
##Uncomment PGO for release build
|
||||
|
||||
# 16 jobs for 16 cores
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j6"
|
||||
# auto detect threads
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
|
||||
|
||||
# x64 build
|
||||
ac_add_options --host=x86_64-pc-mingw32
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# 16 jobs for 16 cores
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j16"
|
||||
# auto detect threads
|
||||
mk_add_options MOZ_MAKE_FLAGS="-j$NUMBER_OF_PROCESSORS"
|
||||
|
||||
# x64 build
|
||||
ac_add_options --host=x86_64-pc-mingw32
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue