Prerelease MSI

t-rex-tileserver · Sep 2, 2017 · f754f95 · f754f95
1 parent 76a02d5
commit f754f95
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -45,24 +45,24 @@ install:
   - set PATH=%PATH%;"%WIX%\bin"
 
 test_script:
-  - cargo build --target %TARGET% --release
-  #- cargo test --no-default-features -p t-rex-core --target %TARGET%
+  - cargo test --no-default-features -p t-rex-core --target %TARGET%
   #- cargo test --no-default-features -p t-rex-core --target %TARGET% --release
   #- cargo run --no-default-features --target %TARGET% --release
+
+before_deploy:
+  # - cargo rustc --no-default-features --target %TARGET% --release --bin t_rex -- -C lto
+  # - ps: ci\before_deploy.ps1
+  - cargo build --target %TARGET% --release
   - cd packaging\windows
   - candle -nologo gdal.wxs
   - candle -nologo projlib.wxs
   - candle -nologo t-rex.wxs
-  - light -nologo -dBuildDir="C:\projects\t-rex\target\%TARGET%\release" -dGdalSrcDir="%GDAL_HOME%\bin" -dProjlibSrcDir="%GDAL_HOME%\bin\proj\SHARE" -sice:ICE80 -o t-rex.msi t-rex.wixobj gdal.wixobj projlib.wixobj
-  - cargo test --all --target %TARGET% --release
-
-before_deploy:
-  # TODO Update this to build the artifacts that matter to you
-  - cargo rustc --no-default-features --target %TARGET% --release --bin t_rex -- -C lto
-  - ps: ci\before_deploy.ps1
+  - light -nologo -dBuildDir="C:\projects\t-rex\target\%TARGET%\release" -dGdalSrcDir="%GDAL_HOME%\bin" -dProjlibSrcDir="%GDAL_HOME%\bin\proj\SHARE" -sice:ICE80 -o t-rex-%APPVEYOR_REPO_TAG_NAME%.msi t-rex.wixobj gdal.wixobj projlib.wixobj
+  - appveyor PushArtifact t-rex-%APPVEYOR_REPO_TAG_NAME%.msi
 
 deploy:
-  artifact: /.*\.zip/
+  # artifact: /.*\.zip/
+  artifact: /.*\.msi/
   auth_token:
     secure: SBSCNxEf2bxSkYTYj95/dAkg0JZmthpcWxufEdr9AyyOXoViT3zyglUT2yfdBAlO
   description: ''

diff --git a/packaging/windows/t-rex.wxs b/packaging/windows/t-rex.wxs
@@ -19,7 +19,7 @@
     <MajorUpgrade AllowDowngrades="yes" />
 
     <Feature Id="TRexFeat" Title="t-rex" Level="1">
-      <ComponentGroupRef Id="t-rex"/>
+      <ComponentGroupRef Id="t_rex"/>
       <ComponentGroupRef Id="gdal"/>
       <ComponentGroupRef Id="projlib"/>
     </Feature>
@@ -33,7 +33,7 @@
       </Directory>
     </Directory>
 
-    <ComponentGroup Id="t-rex">
+    <ComponentGroup Id="t_rex">
       <Component Id="ApplicationExeComp" Directory="BINDIR" Guid="*">
         <File Id="ApplicationExe" KeyPath="yes" Source="!(wix.BuildDir)\t_rex.exe" />
       </Component>