Permalink
Browse files

- Workaround for Hudson bug with build parameters and braces

- Cleaning up auto generated build info
  • Loading branch information...
1 parent 5beea9e commit 73225133c46d75e41a3b71ff834a7715359307d8 @sebdeckers sebdeckers committed Aug 10, 2010
Showing with 9 additions and 11 deletions.
  1. +1 −1 Installer/Appcaster/build_feed.bat
  2. +1 −1 Installer/WiX/version.wxs
  3. +7 −9 build_config.bat
@@ -12,7 +12,7 @@ CScript.exe appcaster.wsf ^
/path:index.xml ^
/overwrite:false ^
/application:"%JOB_NAME%" ^
- /author:"%JOB_NAME% Team" ^
+ /author:"%HOST_COPYRIGHT%" ^
/description:"%JOB_NAME% software updates feed" ^
/location:"%APPCAST_FEED_URL%" ^
/history:"%HUDSON_URL%" ^
@@ -27,5 +27,5 @@
<!--
Unique for each application to prevent update conflicts.
-->
- <?define UpgradeCode="$(env.MSI_GUID)" ?>
+ <?define UpgradeCode="{$(env.MSI_GUID)}" ?>
</Include>
View
@@ -19,24 +19,22 @@ IF NOT DEFINED VERSION_MINOR SET VERSION_MINOR=6
IF NOT DEFINED VERSION_BUILD IF DEFINED BUILD_NUMBER SET VERSION_BUILD=%BUILD_NUMBER%
IF NOT DEFINED VERSION_BUILD SET VERSION_BUILD=0
-:: Hudson
-IF NOT DEFINED HUDSON_URL SET HUDSON_URL=http://build.pandion.im/
-
:: VC++
IF NOT DEFINED HOST_COMMENTS SET HOST_COMMENTS=http://pandion.im/
-IF NOT DEFINED HOST_COMPANY SET HOST_COMPANY=%JOB_NAME%
-IF NOT DEFINED HOST_DESCRIPTION SET HOST_DESCRIPTION=%JOB_NAME% Instant Messenger
-IF NOT DEFINED HOST_COPYRIGHT SET HOST_COPYRIGHT=%JOB_NAME%
+IF NOT DEFINED HOST_COMPANY SET HOST_COMPANY=%JOB_NAME% Contributors
+IF NOT DEFINED HOST_DESCRIPTION SET HOST_DESCRIPTION=%JOB_NAME%
+IF NOT DEFINED HOST_COPYRIGHT SET HOST_COPYRIGHT=%HOST_COMPANY%
:: WiX
IF NOT DEFINED VERSION SET VERSION=%VERSION_MAJOR%.%VERSION_MINOR%.%VERSION_BUILD%
-IF NOT DEFINED PACKAGE SET PACKAGE=%JOB_NAME%_%VERSION%.msi
-IF NOT DEFINED MSI_GUID SET MSI_GUID={9F661F94-F17F-4F5C-B1C8-2955C85C8FE9}
+IF NOT DEFINED PACKAGE SET PACKAGE=%JOB_NAME_SAFE%_%VERSION%.msi
+IF NOT DEFINED MSI_GUID SET MSI_GUID=9F661F94-F17F-4F5C-B1C8-2955C85C8FE9
IF NOT DEFINED MSI_HELP_URL SET MSI_HELP_URL=http://pandion.im/support
IF NOT DEFINED MSI_INFO_URL SET MSI_INFO_URL=http://pandion.im/about
-IF NOT DEFINED MSI_MANUFACTURER SET MSI_MANUFACTURER=%JOB_NAME%
+IF NOT DEFINED MSI_MANUFACTURER SET MSI_MANUFACTURER=%HOST_COMPANY%
:: Appcaster
+IF NOT DEFINED HUDSON_URL SET HUDSON_URL=http://build.pandion.im/
IF NOT DEFINED APPCAST_LOCAL_FILE SET APPCAST_LOCAL_FILE=../WiX/%PACKAGE%
IF NOT DEFINED APPCAST_DOWNLOAD_URL SET APPCAST_DOWNLOAD_URL=http://downloads.sourceforge.net/project/pandion/builds/%PACKAGE%
IF NOT DEFINED APPCAST_INFO_URL SET APPCAST_INFO_URL=%HUDSON_URL%job/%JOB_NAME%/%VERSION_BUILD%/changes

0 comments on commit 7322513

Please sign in to comment.