[prev in list] [next in list] [prev in thread] [next in thread]
List: mapguide-commits
Subject: [mapguide-commits] r9991 - in trunk/Installer: . Bootstrapper Libraries/MapGuide Server Libraries/Ma
From: svn_mapguide () osgeo ! org
Date: 2022-10-18 13:55:14
Message-ID: 20221018135514.6345910DF39 () trac ! osgeo ! org
[Download RAW message or body]
Author: jng
Date: 2022-10-18 06:55:13 -0700 (Tue, 18 Oct 2022)
New Revision: 9991
Removed:
trunk/Installer/Bootstrapper/vcredist_2012_x64.exe
Modified:
trunk/Installer/Bootstrapper/Setup.nsi
trunk/Installer/Libraries/MapGuide Server/FDO.wxs
trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
trunk/Installer/build.bat
Log:
#2852: Fix up file list for installer and remove VC 2012 redist installer
Modified: trunk/Installer/Bootstrapper/Setup.nsi
===================================================================
--- trunk/Installer/Bootstrapper/Setup.nsi 2022-10-18 12:18:22 UTC (rev 9990)
+++ trunk/Installer/Bootstrapper/Setup.nsi 2022-10-18 13:55:13 UTC (rev 9991)
@@ -51,18 +51,6 @@
ClearErrors
BeginInstall:
- ; Install VC 2012 redist. Not going to check here. I think we can trust the \
vcredist install to not trample over anything
- Banner::show /NOUNLOAD "Installing Visual C++ 2012 Redistributable"
- Banner::getWindow /NOUNLOAD
-!if ${CPU} = "x64"
- File /r "${INSTALLER_OUTPUT}\vcredist_2012_x64.exe"
- ExecWait '"$OUTDIR\vcredist_2012_x64.exe" /install /quiet /norestart'
-!else
- File /r "${INSTALLER_OUTPUT}\vcredist_2012_x86.exe"
- ExecWait '"$OUTDIR\vcredist_2012_x86.exe" /install /quiet /norestart'
-!endif
- Banner::destroy
-
; Install VC 2015/2017/2022 redist. Not going to check here. I think we can \
trust the vcredist install to not trample over anything Banner::show /NOUNLOAD \
"Installing Visual C++ 2015 Redistributable" Banner::getWindow /NOUNLOAD
@@ -84,10 +72,8 @@
; Delete the MGOS installer and any other extracted after completion
Delete "$OUTDIR\${OUTNAME}.msi"
!if ${CPU} = "x64"
- Delete "$OUTDIR\vcredist_2012_x64.exe"
Delete "$OUTDIR\vc_redist.x64.exe"
!else
- Delete "$OUTDIR\vcredist_2012_x86.exe"
Delete "$OUTDIR\vc_redist.x86.exe"
!endif
Deleted: trunk/Installer/Bootstrapper/vcredist_2012_x64.exe
===================================================================
(Binary files differ)
Modified: trunk/Installer/Libraries/MapGuide Server/FDO.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2022-10-18 12:18:22 UTC (rev \
9990)
+++ trunk/Installer/Libraries/MapGuide Server/FDO.wxs 2022-10-18 13:55:13 UTC (rev \
9991) @@ -146,8 +146,8 @@
<File Id="PostgreSqlOverrides" Checksum="yes" \
Source="$(var.MgSource)\Server\FDO\PostgreSQLOverrides.dll" />
<File Id="PostgreSqlProvider" Checksum="yes" \
Source="$(var.MgSource)\Server\FDO\PostgreSQLProvider.dll" />
<File Id="LibPq" Checksum="yes" \
Source="$(var.MgSource)\Server\FDO\libpq.dll" />
- <File Id="LibEay" Checksum="yes" \
Source="$(var.MgSource)\Server\FDO\libeay32.dll" />
- <File Id="SslEay" Checksum="yes" \
Source="$(var.MgSource)\Server\FDO\ssleay32.dll" /> + <File Id="LibSsl" \
Checksum="yes" Source="$(var.MgSource)\Server\FDO\libssl-1_1-x64.dll" /> + \
<File Id="LibCrypto" Checksum="yes" \
Source="$(var.MgSource)\Server\FDO\libcrypto-1_1-x64.dll" /> </Component>
<!-- SDF Provider -->
<Component Id="FdoSdfProviderComponent" Win64="$(var.Win64)" \
Guid="F0976038-9F62-42E7-AA6E-B37C33744C6F">
Modified: trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs
===================================================================
--- trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2022-10-18 12:18:22 \
UTC (rev 9990)
+++ trunk/Installer/Libraries/MapGuide Web Extensions/Apache.wxs 2022-10-18 13:55:13 \
UTC (rev 9991) @@ -6,10 +6,10 @@
-->
<?if "$(var.MgPlatform)" = "x64" ?>
<!-- apache_actions.dll path -->
- <?define ACTION_DLL_PATH = \
"..\..\Custom\apache_actions\bin140_x64\apache_actions.dll" ?> + <?define \
ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin142_x64\apache_actions.dll" ?> \
<?else ?> <!-- apache_actions.dll path -->
- <?define ACTION_DLL_PATH = \
"..\..\Custom\apache_actions\bin140_Win32\apache_actions.dll" ?> + <?define \
ACTION_DLL_PATH = "..\..\Custom\apache_actions\bin142_Win32\apache_actions.dll" ?> \
<?endif ?> <Fragment>
<Binary Id="ApacheActions" SourceFile="$(var.ACTION_DLL_PATH)" />
Modified: trunk/Installer/build.bat
===================================================================
--- trunk/Installer/build.bat 2022-10-18 12:18:22 UTC (rev 9990)
+++ trunk/Installer/build.bat 2022-10-18 13:55:13 UTC (rev 9991)
@@ -319,15 +319,15 @@
goto quit
:build
-SET RUN_BUILD=%MSBUILD_CLR% \
/p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion \
=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM_CLR%;Have_ArcSde=%MG_WITH_ARCSDE%
+SET RUN_BUILD=%MSBUILD% \
/p:OutputName=%INSTALLER_NAME%;MgCulture=%CULTURE%;MgTitle=%INSTALLER_TITLE%;MgVersion \
=%INSTALLER_VERSION%;MgRegKey=%MG_REG_KEY%;MgPlatform=%PLATFORM_CLR%;Have_ArcSde=%MG_WITH_ARCSDE%
if not ""=="%MG_SOURCE_INC%" set RUN_BUILD=%RUN_BUILD%;MgSource=%MG_SOURCE_INC%
echo [build]: Installer
%RUN_BUILD% InstallerWix.sln
if "%errorlevel%"=="1" goto error
+if not exist "%INSTALLER_OUTPUT%" mkdir "%INSTALLER_OUTPUT%"
pushd "%INSTALLER_DEV_BOOTSTRAP%"
echo [bootstrap]: Copying vcredist
-copy /Y vcredist_2012_%PLATFORM_CLR%.exe \
"%INSTALLER_OUTPUT%\vcredist_2012_%PLATFORM_CLR%.exe" copy /Y \
vc_redist.%PLATFORM_CLR%.exe "%INSTALLER_OUTPUT%\vc_redist.%PLATFORM_CLR%.exe" popd
if "%errorlevel%"=="1" goto error
_______________________________________________
mapguide-commits mailing list
mapguide-commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/mapguide-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic