From 914fcb4f8d8aaa6009dc1d06b917fe69b7ce3361 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Tue, 23 Mar 2010 22:27:57 +0000 Subject: Initial Windows installer builder combining C++ and WCF components in a WiX-based installer. Merged in from 0.6-release-windows-installer branch r926803 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@926815 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/packaging/windows/build_installer.bat | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 qpid/packaging/windows/build_installer.bat (limited to 'qpid/packaging/windows/build_installer.bat') diff --git a/qpid/packaging/windows/build_installer.bat b/qpid/packaging/windows/build_installer.bat new file mode 100644 index 0000000000..705a4dd21e --- /dev/null +++ b/qpid/packaging/windows/build_installer.bat @@ -0,0 +1,48 @@ +rem +rem Licensed to the Apache Software Foundation (ASF) under one +rem or more contributor license agreements. See the NOTICE file +rem distributed with this work for additional information +rem regarding copyright ownership. The ASF licenses this file +rem to you under the Apache License, Version 2.0 (the +rem "License"); you may not use this file except in compliance +rem with the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, +rem software distributed under the License is distributed on an +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +rem KIND, either express or implied. See the License for the +rem specific language governing permissions and limitations +rem under the License. + +@set vshome="%ProgramFiles%\Microsoft Visual Studio 9.0" +if "%ProgramFiles(x86)%" == "" goto x86only +@set vshome="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0" +if /i %1 == x86 goto x86 +if /i %1 == x64 goto x64 +echo Error in script usage. The correct usage is: +echo %0 [arch] +echo where [arch] is: x86 ^| x64 +goto :eof + +:x86only +@set vsarch=x86 +@set bits=32 +goto run + +:x86 +@set vsarch=x86 +@set bits=32 +goto run + +:x64 +@set vsarch=amd64 +@set bits=64 + +:run +rem If the local cmake needs help, add options to the cmake_options property. +rem For example: cmake_options="-DBOOST_INCLUDE_DIR=C:/Boost/boost-1_40 +rem -DBOOST_LIBRARYDIR=C:/Boost/boost-1_40/lib64" +call %vshome%\VC\vcvarsall.bat %vsarch% +msbuild /property:bits=%bits% installer.proj -- cgit v1.2.1 From b7a05b8debd456793fb114ac1f1abda9d2acfbb7 Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Thu, 25 Mar 2010 00:21:18 +0000 Subject: Add missing qpidxarm.dll and plug-ins to installer; resolves QPID-2467. Fix multi-platform installer build, legal files placement, install notes doc, and other miscellaneous nits in the installer. (Merged in from 0.6-release-windows-installer branch r927233) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@927239 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/packaging/windows/build_installer.bat | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'qpid/packaging/windows/build_installer.bat') diff --git a/qpid/packaging/windows/build_installer.bat b/qpid/packaging/windows/build_installer.bat index 705a4dd21e..addc33f32b 100644 --- a/qpid/packaging/windows/build_installer.bat +++ b/qpid/packaging/windows/build_installer.bat @@ -41,6 +41,13 @@ goto run @set bits=64 :run +rem Two environment variables need to be set: +rem QPID_BUILD_ROOT: root of the build directory; $cwd\build unless the +rem build_dir property is set in msbuild properties below. +rem BOOST_ROOT: root of the Boost installation + +set QPID_BUILD_ROOT=%CD%\build + rem If the local cmake needs help, add options to the cmake_options property. rem For example: cmake_options="-DBOOST_INCLUDE_DIR=C:/Boost/boost-1_40 rem -DBOOST_LIBRARYDIR=C:/Boost/boost-1_40/lib64" -- cgit v1.2.1