From b901fc0808a700a2306a520a98c149f5719fe3fe Mon Sep 17 00:00:00 2001 From: gmanlan Date: Wed, 1 Aug 2018 19:11:29 -0700 Subject: [PATCH 01/16] Automated Win/WiX Installer project + appveyor build script --- .appveyor.yml | 7 +++ dist/win-installer/mlpack-win-installer.sln | 31 +++++++++ .../mlpack-win-installer/Product.wxs | 50 +++++++++++++++ .../mlpack-win-installer.wixproj | 59 ++++++++++++++++++ dist/win-installer/res/banner.bmp | Bin 0 -> 94554 bytes dist/win-installer/res/dialog_white.bmp | Bin 0 -> 474822 bytes dist/win-installer/staging/LICENSE.rtf | Bin 0 -> 2605 bytes 7 files changed, 147 insertions(+) create mode 100644 dist/win-installer/mlpack-win-installer.sln create mode 100644 dist/win-installer/mlpack-win-installer/Product.wxs create mode 100644 dist/win-installer/mlpack-win-installer/mlpack-win-installer.wixproj create mode 100644 dist/win-installer/res/banner.bmp create mode 100644 dist/win-installer/res/dialog_white.bmp create mode 100644 dist/win-installer/staging/LICENSE.rtf diff --git a/.appveyor.yml b/.appveyor.yml index dae15df614..80b64f2e9e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -37,9 +37,16 @@ build_script: - '"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" "C:\projects\mlpack\build\mlpack.sln" /m /verbosity:minimal /nologo /p:BuildInParallel=true /p:Configuration=Release;Platform=x64' - 7z a mlpack-windows-no-libs.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.exe" - 7z a mlpack-windows.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.*" "%APPVEYOR_BUILD_FOLDER%/OpenBLAS.0.2.14.1/lib/native/lib/x64/*.*" + - ps: cp %APPVEYOR_BUILD_FOLDER%\build\Release\*.* %APPVEYOR_BUILD_FOLDER%\dist\win-installer\staging\lib\ + - ps: cp %APPVEYOR_BUILD_FOLDER%\build\include\*.* %APPVEYOR_BUILD_FOLDER%\dist\win-installer\staging\ + - '"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" "%APPVEYOR_BUILD_FOLDER%\dist\win-installer\mlpack-win-installer.sln" /m /verbosity:minimal /nologo /p:BuildInParallel=true /p:Configuration=Release;Platform=x64' artifacts: - path: '**\*.zip' + - name: mlpack-windows-zip + + - path: '%APPVEYOR_BUILD_FOLDER%\dist\win-installer\mlpack-win-installer\bin\x64\Release\*.msi' + - name: mlpack-windows-installer notifications: - provider: Email diff --git a/dist/win-installer/mlpack-win-installer.sln b/dist/win-installer/mlpack-win-installer.sln new file mode 100644 index 0000000000..c3b70f0003 --- /dev/null +++ b/dist/win-installer/mlpack-win-installer.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2026 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "mlpack-win-installer", "mlpack-win-installer\mlpack-win-installer.wixproj", "{5409C191-C4B0-4CAF-954C-001BB5C1D136}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x64.ActiveCfg = Debug|x86 + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x64.Build.0 = Debug|x86 + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x86.ActiveCfg = Debug|x86 + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x86.Build.0 = Debug|x86 + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x64.ActiveCfg = Release|x64 + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x64.Build.0 = Release|x64 + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x86.ActiveCfg = Release|x86 + {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BD061BDC-CB0E-4919-86D8-ADA2ED1B670A} + EndGlobalSection +EndGlobal diff --git a/dist/win-installer/mlpack-win-installer/Product.wxs b/dist/win-installer/mlpack-win-installer/Product.wxs new file mode 100644 index 0000000000..ecaeeab9de --- /dev/null +++ b/dist/win-installer/mlpack-win-installer/Product.wxs @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/win-installer/mlpack-win-installer/mlpack-win-installer.wixproj b/dist/win-installer/mlpack-win-installer/mlpack-win-installer.wixproj new file mode 100644 index 0000000000..8795a920eb --- /dev/null +++ b/dist/win-installer/mlpack-win-installer/mlpack-win-installer.wixproj @@ -0,0 +1,59 @@ + + + + Debug + x86 + 3.10 + 5409c191-c4b0-4caf-954c-001bb5c1d136 + 2.0 + mlpack-windows + Package + mlpack-win-installer + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + Debug + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + + HarvestPath=..\staging + + + + + + + + $(WixExtDir)\WixUIExtension.dll + WixUIExtension + + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/win-installer/res/banner.bmp b/dist/win-installer/res/banner.bmp new file mode 100644 index 0000000000000000000000000000000000000000..929447173fb28509ad062076e6b59bf55bcd473d GIT binary patch literal 94554 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 f@jG(7djNT-8?Z;jJ1aFZy3=kB7g@o-c)$Dwvb Date: Wed, 1 Aug 2018 19:33:39 -0700 Subject: [PATCH 02/16] fix artifacts path --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 80b64f2e9e..9fead35573 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -43,10 +43,10 @@ build_script: artifacts: - path: '**\*.zip' - - name: mlpack-windows-zip + name: mlpack-windows-zip - path: '%APPVEYOR_BUILD_FOLDER%\dist\win-installer\mlpack-win-installer\bin\x64\Release\*.msi' - - name: mlpack-windows-installer + name: mlpack-windows-installer notifications: - provider: Email From a0a177bb3b144184f52eb3e548edf5b0fc3bcb5a Mon Sep 17 00:00:00 2001 From: gmanlan Date: Wed, 1 Aug 2018 21:34:34 -0700 Subject: [PATCH 03/16] fix staging cp commands --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 9fead35573..3fc2a7ef6e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -37,8 +37,8 @@ build_script: - '"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" "C:\projects\mlpack\build\mlpack.sln" /m /verbosity:minimal /nologo /p:BuildInParallel=true /p:Configuration=Release;Platform=x64' - 7z a mlpack-windows-no-libs.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.exe" - 7z a mlpack-windows.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.*" "%APPVEYOR_BUILD_FOLDER%/OpenBLAS.0.2.14.1/lib/native/lib/x64/*.*" - - ps: cp %APPVEYOR_BUILD_FOLDER%\build\Release\*.* %APPVEYOR_BUILD_FOLDER%\dist\win-installer\staging\lib\ - - ps: cp %APPVEYOR_BUILD_FOLDER%\build\include\*.* %APPVEYOR_BUILD_FOLDER%\dist\win-installer\staging\ + - ps: cp C:\projects\mlpack\build\Release\*.* C:\projects\mlpack\dist\win-installer\staging\lib\ + - ps: cp C:\projects\mlpack\build\include\*.* C:\projects\mlpack\dist\win-installer\staging\ - '"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" "%APPVEYOR_BUILD_FOLDER%\dist\win-installer\mlpack-win-installer.sln" /m /verbosity:minimal /nologo /p:BuildInParallel=true /p:Configuration=Release;Platform=x64' artifacts: From 0ec959f70cb56d080a80fd71cdd8ea1ef5be471a Mon Sep 17 00:00:00 2001 From: gmanlan Date: Thu, 2 Aug 2018 18:52:36 -0700 Subject: [PATCH 04/16] lowercase product name --- .../mlpack-win-installer/Product.wxs | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dist/win-installer/mlpack-win-installer/Product.wxs b/dist/win-installer/mlpack-win-installer/Product.wxs index ecaeeab9de..cbda928b2a 100644 --- a/dist/win-installer/mlpack-win-installer/Product.wxs +++ b/dist/win-installer/mlpack-win-installer/Product.wxs @@ -3,48 +3,45 @@ + Manufacturer="mlpack"> - - + - + - + - - - - - + + + + + - + - - - + + - - From 9457a6c6e1535eb57b1a2ada2b348ce2835b2ad1 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Thu, 2 Aug 2018 19:10:04 -0700 Subject: [PATCH 05/16] removing installer sln --- dist/win-installer/mlpack-win-installer.sln | 31 --------------------- 1 file changed, 31 deletions(-) delete mode 100644 dist/win-installer/mlpack-win-installer.sln diff --git a/dist/win-installer/mlpack-win-installer.sln b/dist/win-installer/mlpack-win-installer.sln deleted file mode 100644 index c3b70f0003..0000000000 --- a/dist/win-installer/mlpack-win-installer.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2026 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "mlpack-win-installer", "mlpack-win-installer\mlpack-win-installer.wixproj", "{5409C191-C4B0-4CAF-954C-001BB5C1D136}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x64.ActiveCfg = Debug|x86 - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x64.Build.0 = Debug|x86 - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x86.ActiveCfg = Debug|x86 - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Debug|x86.Build.0 = Debug|x86 - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x64.ActiveCfg = Release|x64 - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x64.Build.0 = Release|x64 - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x86.ActiveCfg = Release|x86 - {5409C191-C4B0-4CAF-954C-001BB5C1D136}.Release|x86.Build.0 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {BD061BDC-CB0E-4919-86D8-ADA2ED1B670A} - EndGlobalSection -EndGlobal From afca11766ab9fa1e05c90476fb9d1a27aeb25887 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Thu, 2 Aug 2018 19:10:46 -0700 Subject: [PATCH 06/16] switching from sln to raw wix build commands --- .appveyor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3fc2a7ef6e..afb63120e8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -37,9 +37,13 @@ build_script: - '"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" "C:\projects\mlpack\build\mlpack.sln" /m /verbosity:minimal /nologo /p:BuildInParallel=true /p:Configuration=Release;Platform=x64' - 7z a mlpack-windows-no-libs.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.exe" - 7z a mlpack-windows.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.*" "%APPVEYOR_BUILD_FOLDER%/OpenBLAS.0.2.14.1/lib/native/lib/x64/*.*" + - cd C:\projects\mlpack\dist\win-installer\staging && mkdir lib - ps: cp C:\projects\mlpack\build\Release\*.* C:\projects\mlpack\dist\win-installer\staging\lib\ - ps: cp C:\projects\mlpack\build\include\*.* C:\projects\mlpack\dist\win-installer\staging\ - - '"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" "%APPVEYOR_BUILD_FOLDER%\dist\win-installer\mlpack-win-installer.sln" /m /verbosity:minimal /nologo /p:BuildInParallel=true /p:Configuration=Release;Platform=x64' + - cd C:\projects\mlpack\dist\win-installer\mlpack-win-installer + - heat dir ..\staging -cg HeatGenerated -dr INSTALLFOLDER -sreg -srd -var var.HarvestPath -ag -sfrag -out HeatGeneratedFileList.wxs + - candle -dHarvestPath=..\staging -dConfiguration=Release -dOutDir=bin\x64\Release\ -dPlatform=x64 -dProjectDir=. -dProjectExt=.wixproj -dProjectFileName=mlpack-win-installer.wixproj -dProjectName=mlpack-win-installer -dProjectPath=mlpack-win-installer.wixproj -dTargetDir=.\bin\x64\Release\ -dTargetExt=.msi -dTargetFileName=mlpack-windows.msi -dTargetName=mlpack-windows -dTargetPath=.\bin\x64\Release\mlpack-windows.msi -out obj\x64\Release\ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs HeatGeneratedFileList.wxs + - light -out .\bin\x64\Release\mlpack-windows.msi -pdbout .\bin\x64\Release\mlpack-windows.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\x64\Release\mlpack-win-installer.wixproj.BindContentsFileListnull.txt -outputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile mlpack-win-installer.wixproj obj\x64\Release\Product.wixobj obj\x64\Release\HeatGeneratedFileList.wixobj artifacts: - path: '**\*.zip' From 4dba5adc01f25ea7f5665691ab1551b7a6b71ce6 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Sat, 4 Aug 2018 12:30:28 -0700 Subject: [PATCH 07/16] + adding WiX to PATH + setting MLPACK version env:var --- .appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index afb63120e8..635262dd19 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -19,6 +19,9 @@ install: - ps: nuget install boost_serialization-vc140 -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 - ps: nuget install boost_math_c99-vc140 -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 - ps: nuget install OpenBLAS -o "${env:APPVEYOR_BUILD_FOLDER}" + - set path=C:\Program Files (x86)\WiX Toolset v3.11\bin;%path% + - ps: $ver = (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\src\mlpack\core\util\version.hpp" | where {$_ -like "*MLPACK_VERSION*"}); $env:MLPACK_VERSION = ($ver[0].substring($ver[0].length-1,1)+'.'+$ver[1].substring($ver[1].length-1,1)+'.'+$ver[2].substring($ver[2].length-1,1)) + - echo ML_PACK_VERSION is %MLPACK_VERSION% build_script: - mkdir boost_libs From 1ea5e981e858c104830c96cd59e59105b8788102 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Sat, 4 Aug 2018 12:31:37 -0700 Subject: [PATCH 08/16] switching to jpg resources --- .../mlpack-win-installer/Product.wxs | 4 ++-- dist/win-installer/res/banner.bmp | Bin 94554 -> 0 bytes dist/win-installer/res/banner.jpg | Bin 0 -> 3752 bytes dist/win-installer/res/dialog_white.bmp | Bin 474822 -> 0 bytes dist/win-installer/res/dialog_white.jpg | Bin 0 -> 8115 bytes 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 dist/win-installer/res/banner.bmp create mode 100644 dist/win-installer/res/banner.jpg delete mode 100644 dist/win-installer/res/dialog_white.bmp create mode 100644 dist/win-installer/res/dialog_white.jpg diff --git a/dist/win-installer/mlpack-win-installer/Product.wxs b/dist/win-installer/mlpack-win-installer/Product.wxs index cbda928b2a..9ff28abbff 100644 --- a/dist/win-installer/mlpack-win-installer/Product.wxs +++ b/dist/win-installer/mlpack-win-installer/Product.wxs @@ -24,8 +24,8 @@ - - + + diff --git a/dist/win-installer/res/banner.bmp b/dist/win-installer/res/banner.bmp deleted file mode 100644 index 929447173fb28509ad062076e6b59bf55bcd473d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94554 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 literal 0 HcmV?d00001 diff --git a/dist/win-installer/res/dialog_white.bmp b/dist/win-installer/res/dialog_white.bmp deleted file mode 100644 index 5526d462ae34f534beef37cdabe2b98f288b757d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474822 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 Date: Sat, 4 Aug 2018 14:50:53 -0700 Subject: [PATCH 09/16] Adding installer localization file --- .../mlpack-win-installer/mlpack-localization.wxl | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 dist/win-installer/mlpack-win-installer/mlpack-localization.wxl diff --git a/dist/win-installer/mlpack-win-installer/mlpack-localization.wxl b/dist/win-installer/mlpack-win-installer/mlpack-localization.wxl new file mode 100644 index 0000000000..8cc9329065 --- /dev/null +++ b/dist/win-installer/mlpack-win-installer/mlpack-localization.wxl @@ -0,0 +1,7 @@ + + + 1033 + {\WixUI_Font_Bigger}Welcome to the [ProductName] [MLPACK_VERSION] Setup Wizard + The Setup Wizard will install [ProductName] [MLPACK_VERSION] on your computer. Click Next to continue or Cancel to exit the Setup Wizard. + + \ No newline at end of file From b50a6acfb0fe835626c8ee8d20a269ea082e0aae Mon Sep 17 00:00:00 2001 From: gmanlan Date: Sat, 4 Aug 2018 14:51:23 -0700 Subject: [PATCH 10/16] + localization file + fix artifact path --- .appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 635262dd19..afdef1e809 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -21,7 +21,7 @@ install: - ps: nuget install OpenBLAS -o "${env:APPVEYOR_BUILD_FOLDER}" - set path=C:\Program Files (x86)\WiX Toolset v3.11\bin;%path% - ps: $ver = (Get-Content "${env:APPVEYOR_BUILD_FOLDER}\src\mlpack\core\util\version.hpp" | where {$_ -like "*MLPACK_VERSION*"}); $env:MLPACK_VERSION = ($ver[0].substring($ver[0].length-1,1)+'.'+$ver[1].substring($ver[1].length-1,1)+'.'+$ver[2].substring($ver[2].length-1,1)) - - echo ML_PACK_VERSION is %MLPACK_VERSION% + - echo MLPACK_VERSION is %MLPACK_VERSION% build_script: - mkdir boost_libs @@ -46,13 +46,13 @@ build_script: - cd C:\projects\mlpack\dist\win-installer\mlpack-win-installer - heat dir ..\staging -cg HeatGenerated -dr INSTALLFOLDER -sreg -srd -var var.HarvestPath -ag -sfrag -out HeatGeneratedFileList.wxs - candle -dHarvestPath=..\staging -dConfiguration=Release -dOutDir=bin\x64\Release\ -dPlatform=x64 -dProjectDir=. -dProjectExt=.wixproj -dProjectFileName=mlpack-win-installer.wixproj -dProjectName=mlpack-win-installer -dProjectPath=mlpack-win-installer.wixproj -dTargetDir=.\bin\x64\Release\ -dTargetExt=.msi -dTargetFileName=mlpack-windows.msi -dTargetName=mlpack-windows -dTargetPath=.\bin\x64\Release\mlpack-windows.msi -out obj\x64\Release\ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs HeatGeneratedFileList.wxs - - light -out .\bin\x64\Release\mlpack-windows.msi -pdbout .\bin\x64\Release\mlpack-windows.wixpdb -cultures:null -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\x64\Release\mlpack-win-installer.wixproj.BindContentsFileListnull.txt -outputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile mlpack-win-installer.wixproj obj\x64\Release\Product.wixobj obj\x64\Release\HeatGeneratedFileList.wixobj + - light -out .\bin\x64\Release\mlpack-windows.msi -pdbout .\bin\x64\Release\mlpack-windows.wixpdb -cultures:null -loc mlpack-localization.wxl -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\x64\Release\mlpack-win-installer.wixproj.BindContentsFileListnull.txt -outputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile mlpack-win-installer.wixproj obj\x64\Release\Product.wixobj obj\x64\Release\HeatGeneratedFileList.wixobj artifacts: - path: '**\*.zip' name: mlpack-windows-zip - - path: '%APPVEYOR_BUILD_FOLDER%\dist\win-installer\mlpack-win-installer\bin\x64\Release\*.msi' + - path: 'dist\win-installer\mlpack-win-installer\bin\x64\Release\*.msi' name: mlpack-windows-installer notifications: From ce03522a2776981ee0c10b0d915f033e0cd3f9f0 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Sat, 4 Aug 2018 14:52:08 -0700 Subject: [PATCH 11/16] load mlpack version automatically from env:var --- dist/win-installer/mlpack-win-installer/Product.wxs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dist/win-installer/mlpack-win-installer/Product.wxs b/dist/win-installer/mlpack-win-installer/Product.wxs index 9ff28abbff..4adafc2a23 100644 --- a/dist/win-installer/mlpack-win-installer/Product.wxs +++ b/dist/win-installer/mlpack-win-installer/Product.wxs @@ -1,11 +1,12 @@ - + + - + $(env.MLPACK_VERSION) From a6a2a27315b355db3348812d382abb09ee042516 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Sat, 4 Aug 2018 16:41:31 -0700 Subject: [PATCH 12/16] fix path for includes --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index afdef1e809..717459f304 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -42,7 +42,7 @@ build_script: - 7z a mlpack-windows.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.*" "%APPVEYOR_BUILD_FOLDER%/OpenBLAS.0.2.14.1/lib/native/lib/x64/*.*" - cd C:\projects\mlpack\dist\win-installer\staging && mkdir lib - ps: cp C:\projects\mlpack\build\Release\*.* C:\projects\mlpack\dist\win-installer\staging\lib\ - - ps: cp C:\projects\mlpack\build\include\*.* C:\projects\mlpack\dist\win-installer\staging\ + - ps: cp C:\projects\mlpack\build\include\mlpack C:\projects\mlpack\dist\win-installer\staging -recurse - cd C:\projects\mlpack\dist\win-installer\mlpack-win-installer - heat dir ..\staging -cg HeatGenerated -dr INSTALLFOLDER -sreg -srd -var var.HarvestPath -ag -sfrag -out HeatGeneratedFileList.wxs - candle -dHarvestPath=..\staging -dConfiguration=Release -dOutDir=bin\x64\Release\ -dPlatform=x64 -dProjectDir=. -dProjectExt=.wixproj -dProjectFileName=mlpack-win-installer.wixproj -dProjectName=mlpack-win-installer -dProjectPath=mlpack-win-installer.wixproj -dTargetDir=.\bin\x64\Release\ -dTargetExt=.msi -dTargetFileName=mlpack-windows.msi -dTargetName=mlpack-windows -dTargetPath=.\bin\x64\Release\mlpack-windows.msi -out obj\x64\Release\ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs HeatGeneratedFileList.wxs From 1f8b49838438306c743d1866e4e077acdc39a1ea Mon Sep 17 00:00:00 2001 From: gmanlan Date: Wed, 15 Aug 2018 18:50:46 -0700 Subject: [PATCH 13/16] +version on .msi filename + doxygen install --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 717459f304..586eca4167 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,6 +12,7 @@ configuration: Release os: Visual Studio 2015 install: + - cinst doxygen.portable - ps: nuget install boost -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 - ps: nuget install boost_unit_test_framework-vc140 -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 - ps: nuget install boost_program_options-vc140 -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 @@ -46,7 +47,7 @@ build_script: - cd C:\projects\mlpack\dist\win-installer\mlpack-win-installer - heat dir ..\staging -cg HeatGenerated -dr INSTALLFOLDER -sreg -srd -var var.HarvestPath -ag -sfrag -out HeatGeneratedFileList.wxs - candle -dHarvestPath=..\staging -dConfiguration=Release -dOutDir=bin\x64\Release\ -dPlatform=x64 -dProjectDir=. -dProjectExt=.wixproj -dProjectFileName=mlpack-win-installer.wixproj -dProjectName=mlpack-win-installer -dProjectPath=mlpack-win-installer.wixproj -dTargetDir=.\bin\x64\Release\ -dTargetExt=.msi -dTargetFileName=mlpack-windows.msi -dTargetName=mlpack-windows -dTargetPath=.\bin\x64\Release\mlpack-windows.msi -out obj\x64\Release\ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs HeatGeneratedFileList.wxs - - light -out .\bin\x64\Release\mlpack-windows.msi -pdbout .\bin\x64\Release\mlpack-windows.wixpdb -cultures:null -loc mlpack-localization.wxl -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\x64\Release\mlpack-win-installer.wixproj.BindContentsFileListnull.txt -outputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile mlpack-win-installer.wixproj obj\x64\Release\Product.wixobj obj\x64\Release\HeatGeneratedFileList.wixobj + - light -out .\bin\x64\Release\mlpack-%MLPACK_VERSION%.msi -pdbout .\bin\x64\Release\mlpack-windows.wixpdb -cultures:null -loc mlpack-localization.wxl -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\x64\Release\mlpack-win-installer.wixproj.BindContentsFileListnull.txt -outputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile mlpack-win-installer.wixproj obj\x64\Release\Product.wixobj obj\x64\Release\HeatGeneratedFileList.wixobj artifacts: - path: '**\*.zip' From 0363841cecc9e658f29b2016be46468b931874be Mon Sep 17 00:00:00 2001 From: gmanlan Date: Fri, 17 Aug 2018 18:07:54 -0700 Subject: [PATCH 14/16] pulling doc from jenkins + adding doc & examples into installer --- .appveyor.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 586eca4167..e34525c341 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,7 +12,6 @@ configuration: Release os: Visual Studio 2015 install: - - cinst doxygen.portable - ps: nuget install boost -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 - ps: nuget install boost_unit_test_framework-vc140 -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 - ps: nuget install boost_program_options-vc140 -o "${env:APPVEYOR_BUILD_FOLDER}" -Version 1.60.0 @@ -39,11 +38,22 @@ build_script: - cd C:\projects\mlpack && mkdir build && cd build - cmake -G "Visual Studio 14 2015 Win64" -DBLAS_LIBRARY:FILEPATH="%APPVEYOR_BUILD_FOLDER%/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DLAPACK_LIBRARY:FILEPATH="%APPVEYOR_BUILD_FOLDER%/OpenBLAS.0.2.14.1/lib/native/lib/x64/libopenblas.dll.a" -DARMADILLO_INCLUDE_DIR="C:/projects/mlpack/armadillo-7.800.2/include" -DARMADILLO_LIBRARY:FILEPATH="C:\projects\mlpack\armadillo-7.800.2\build\Debug\armadillo.lib" -DBOOST_INCLUDEDIR:PATH="C:\projects\mlpack\boost.1.60.0.0\lib\native\include" -DBOOST_LIBRARYDIR:PATH="C:\projects\mlpack\boost_libs" -DDEBUG=OFF -DPROFILE=OFF -DBUILD_PYTHON_BINDINGS=OFF -DCMAKE_BUILD_TYPE=Release .. - '"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" "C:\projects\mlpack\build\mlpack.sln" /m /verbosity:minimal /nologo /p:BuildInParallel=true /p:Configuration=Release;Platform=x64' + + # Zip Artifacts - 7z a mlpack-windows-no-libs.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.exe" - 7z a mlpack-windows.zip "%APPVEYOR_BUILD_FOLDER%\build\Release\*.*" "%APPVEYOR_BUILD_FOLDER%/OpenBLAS.0.2.14.1/lib/native/lib/x64/*.*" + + # Pulling documentation for the installer + - ps: try{(new-object net.webclient).DownloadFile('http://ci.mlpack.org/job/mlpack%20-%20doxygen%20build/lastSuccessfulBuild/artifact/build/doc/html/*zip*/html.zip', 'C:\projects\mlpack\dist\win-installer\jenkinsdoc.zip')}catch{Write-Output "Unable to pull jenkins doc, skipping!"} + - ps: try{(Add-Type -AssemblyName System.IO.Compression.FileSystem); [System.IO.Compression.ZipFile]::ExtractToDirectory('C:\projects\mlpack\dist\win-installer\jenkinsdoc.zip', 'C:\projects\mlpack\dist\win-installer\staging\doc')}catch{Write-Output "Unable to add doc to installer, skipping!"} + + # Preparing installer staging - cd C:\projects\mlpack\dist\win-installer\staging && mkdir lib - ps: cp C:\projects\mlpack\build\Release\*.* C:\projects\mlpack\dist\win-installer\staging\lib\ - ps: cp C:\projects\mlpack\build\include\mlpack C:\projects\mlpack\dist\win-installer\staging -recurse + - ps: cp C:\projects\mlpack\doc\examples C:\projects\mlpack\dist\win-installer\staging -recurse + + # Building MSI installer - cd C:\projects\mlpack\dist\win-installer\mlpack-win-installer - heat dir ..\staging -cg HeatGenerated -dr INSTALLFOLDER -sreg -srd -var var.HarvestPath -ag -sfrag -out HeatGeneratedFileList.wxs - candle -dHarvestPath=..\staging -dConfiguration=Release -dOutDir=bin\x64\Release\ -dPlatform=x64 -dProjectDir=. -dProjectExt=.wixproj -dProjectFileName=mlpack-win-installer.wixproj -dProjectName=mlpack-win-installer -dProjectPath=mlpack-win-installer.wixproj -dTargetDir=.\bin\x64\Release\ -dTargetExt=.msi -dTargetFileName=mlpack-windows.msi -dTargetName=mlpack-windows -dTargetPath=.\bin\x64\Release\mlpack-windows.msi -out obj\x64\Release\ -arch x64 -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" Product.wxs HeatGeneratedFileList.wxs From eceb293dccba097613369b000abb7a02272b3d60 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Fri, 24 Aug 2018 17:32:35 -0700 Subject: [PATCH 15/16] adding boost and armadillo licenses for the dist. --- dist/win-installer/staging/LICENSE.rtf | Bin 2605 -> 16840 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/dist/win-installer/staging/LICENSE.rtf b/dist/win-installer/staging/LICENSE.rtf index 9ad3d38f3ad94f3190d4c8778a080dff81743d35..40712bd5a5a5322cc866ac2daef6f6a1e2b2aeff 100644 GIT binary patch literal 16840 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 From ebe1d035c06081b3ae5c6ebcdc9a431565a67360 Mon Sep 17 00:00:00 2001 From: gmanlan Date: Fri, 24 Aug 2018 17:52:38 -0700 Subject: [PATCH 16/16] + only publishing artifacts in the build dir + moving .exe/.dll to the root installer dir and keeping .lib/.exp in /lib + adding dependencies dlls into the installer --- .appveyor.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e34525c341..ee801b616e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -49,7 +49,12 @@ build_script: # Preparing installer staging - cd C:\projects\mlpack\dist\win-installer\staging && mkdir lib - - ps: cp C:\projects\mlpack\build\Release\*.* C:\projects\mlpack\dist\win-installer\staging\lib\ + - ps: cp C:\projects\mlpack\build\Release\*.lib C:\projects\mlpack\dist\win-installer\staging\lib\ + - ps: cp C:\projects\mlpack\build\Release\*.exp C:\projects\mlpack\dist\win-installer\staging\lib\ + - ps: cp C:\projects\mlpack\build\Release\*.dll C:\projects\mlpack\dist\win-installer\staging\ + - ps: cp C:\projects\mlpack\build\Release\*.exe C:\projects\mlpack\dist\win-installer\staging\ + - ps: cp C:\projects\mlpack\OpenBLAS.0.2.14.1\lib\native\bin\x64\*.dll C:\projects\mlpack\dist\win-installer\staging\ + - ps: cp C:\projects\mlpack\boost_libs\boost_unit_test_framework-vc*.dll C:\projects\mlpack\dist\win-installer\staging\ - ps: cp C:\projects\mlpack\build\include\mlpack C:\projects\mlpack\dist\win-installer\staging -recurse - ps: cp C:\projects\mlpack\doc\examples C:\projects\mlpack\dist\win-installer\staging -recurse @@ -60,7 +65,7 @@ build_script: - light -out .\bin\x64\Release\mlpack-%MLPACK_VERSION%.msi -pdbout .\bin\x64\Release\mlpack-windows.wixpdb -cultures:null -loc mlpack-localization.wxl -ext "C:\Program Files (x86)\WiX Toolset v3.11\bin\\WixUIExtension.dll" -contentsfile obj\x64\Release\mlpack-win-installer.wixproj.BindContentsFileListnull.txt -outputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindOutputsFileListnull.txt -builtoutputsfile obj\x64\Release\mlpack-win-installer.wixproj.BindBuiltOutputsFileListnull.txt -wixprojectfile mlpack-win-installer.wixproj obj\x64\Release\Product.wixobj obj\x64\Release\HeatGeneratedFileList.wixobj artifacts: - - path: '**\*.zip' + - path: 'build\*.zip' name: mlpack-windows-zip - path: 'dist\win-installer\mlpack-win-installer\bin\x64\Release\*.msi'