changing possible values for UNOFFICIAL_RELEASE and SKIP_MSIVAL2 to empty or non-empty string; fixing ensure-deliverables make target

Author: Vlad Ionescu

Makefile

@@ -24,12 +24,14 @@ ensure-deliverables: rabbit-vsn
 	file ${RELEASE_DIR}/${NAME_VSN}-api-guide.pdf
 	file ${RELEASE_DIR}/${NAME_VSN}-user-guide.pdf
 	file ${RELEASE_DIR}/${NAME_VSN}-wcf-service-model.pdf
-	file ${RELEASE_DIR}/${NAME_VSN}-net-2.0.zip
+	file ${RELEASE_DIR}/${NAME_VSN}-dotnet-2.0.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-client-htmldoc
-	file ${RELEASE_DIR}/${NAME_VSN}-net-3.0.zip
+	file ${RELEASE_DIR}/${NAME_VSN}-dotnet-3.0.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-wcf-htmldoc.zip
 	file ${RELEASE_DIR}/${NAME_VSN}-wcf-htmldoc
+	file ${RELEASE_DIR}/${NAME_VSN}.msi
+	file ${RELEASE_DIR}/${NAME_VSN}.msm
 
 ensure-prerequisites: rabbit-vsn
 	dpkg -L htmldoc plotutils transfig graphviz docbook-utils > /dev/null

dist-msi.sh

@@ -67,7 +67,7 @@ CYGWIN=nontsec
 
 ### Overrideable vars
 test "$RABBIT_VSN" || RABBIT_VSN=0.0.0
-test "$SKIP_MSIVAL2" || SKIP_MSIVAL2=false
+test "$SKIP_MSIVAL2" || SKIP_MSIVAL2=
 
 ### Other, general vars
 NAME=rabbitmq-dotnet-client
@@ -100,14 +100,14 @@ function build-msm-msi {
 
     candle -out ../tmp/wix/rabbitmq-dotnet-client-msm.wixobj dotnet-client-merge-module.wxs
     light -out ../tmp/wix/rabbitmq-dotnet-client.msm ../tmp/wix/rabbitmq-dotnet-client-msm.wixobj
-    test "$SKIP_MSIVAL2" == "true" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msm ../lib/wix/mergemod.cub -f
+    test "$SKIP_MSIVAL2" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msm ../lib/wix/mergemod.cub -f
 
     candle -out ../tmp/wix/rabbitmq-dotnet-client-msi.wixobj dotnet-client-product.wxs
     light -out ../tmp/wix/rabbitmq-dotnet-client.msi \
         ../tmp/wix/rabbitmq-dotnet-client-msi.wixobj \
         ../lib/wix/wixui.wixlib \
         -loc WixUI_en-us.wxl
-    test "$SKIP_MSIVAL2" == "true" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msi ../lib/wix/darice.cub -f
+    test "$SKIP_MSIVAL2" || MsiVal2.exe ../tmp/wix/rabbitmq-dotnet-client.msi ../lib/wix/darice.cub -f
 
     cd ..
 

dist.sh

@@ -69,9 +69,9 @@ CYGWIN=nontsec
 ### Overrideable vars
 test "$KEYFILE" || KEYFILE=rabbit-mock.snk
 test "$RABBIT_VSN" || RABBIT_VSN=0.0.0
-test "$UNOFFICIAL_RELEASE" || UNOFFICIAL_RELEASE=true
 test "$MSBUILD" || MSBUILD=msbuild.exe
 test "$RABBIT_WEBSITE" || RABBIT_WEBSITE=http://www.rabbitmq.com
+test "$UNOFFICIAL_RELEASE" || UNOFFICIAL_RELEASE=
 
 ### Other, general vars
 NAME=rabbitmq-dotnet-client
@@ -87,7 +87,7 @@ function main {
     ### Check keyfile exists and generate if necessary, or exit with error if
     ### we're building an official release
     if [ ! -f "$KEYFILE" ]; then
-        if [ "$UNOFFICIAL_RELEASE" == "true" ]; then
+        if [ "$UNOFFICIAL_RELEASE" ]; then
             sn -k $KEYFILE
         else
             echo "ERROR! Keyfile $KEYFILE not found."