qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shus...@apache.org
Subject svn commit: r1212826 - in /qpid/trunk/qpid/packaging/windows: INSTALL_NOTES.html installer.proj qpidc.wxs
Date Sat, 10 Dec 2011 17:05:20 GMT
Author: shuston
Date: Sat Dec 10 17:05:19 2011
New Revision: 1212826

URL: http://svn.apache.org/viewvc?rev=1212826&view=rev
Log:
Gets the examples up to date to just before they changed to separate msvc9 and 10 directories.
Solves the immediately reported issue but more work will be needed under a different jira.
Resolves QPID-3674.

Modified:
    qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
    qpid/trunk/qpid/packaging/windows/installer.proj
    qpid/trunk/qpid/packaging/windows/qpidc.wxs

Modified: qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html?rev=1212826&r1=1212825&r2=1212826&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html (original)
+++ qpid/trunk/qpid/packaging/windows/INSTALL_NOTES.html Sat Dec 10 17:05:19 2011
@@ -1,11 +1,11 @@
 <html>
 <head>
-<title>Apache Qpid C++ 0.10 Installation Notes</title>
+<title>Apache Qpid C++ 0.15 Installation Notes</title>
 </head>
 <body>
-<H1>Apache Qpid C++ 0.10 Installation Notes</H1>
+<H1>Apache Qpid C++ 0.15 Installation Notes</H1>
 
-<p>Thank you for installing Apache Qpid version 0.10 for Windows.
+<p>Thank you for installing Apache Qpid version 0.15 for Windows.
 If the requisite features were installed, you can now run a broker,
 use the example programs, and design your own messaging programs while
 reading the Qpid C++ API reference documentation.</p>
@@ -36,6 +36,11 @@ command prompt window where the broker i
 
 <H2>Using the Example Programs</H2>
 
+<p>If you installed the example programs, a new environment variable was
+set. <code>QPID_ROOT</code> refers to the Qpid installation directory. The
+Visual Studio project files located in the examples area refer to
+<code>QPID_ROOT</code> to locate both header files and library files.</p>
+
 <p>The example programs are located in the <code>examples</code> subdirectory
 of the Qpid installation directory. There are a number of examples, each with
 its own subdirectory under <code>examples</code>. You can use the examples to
@@ -78,7 +83,7 @@ default; therefore, to gain support for 
 must be loaded into the broker. This can be done using the
 <code>--load-module</code> option to load the needed plugins. For example:
 <pre>
-cd "C:\Program Files\Apache\qpidc-0.9"
+cd "C:\Program Files\Apache\qpidc-0.15"
 qpidd.exe --load-module plugins\broker\store.dll --load-module plugins\broker\msclfs_store.dll
 </pre>
 The <code>--load-module</code> option can also take a full path. The option

Modified: qpid/trunk/qpid/packaging/windows/installer.proj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/installer.proj?rev=1212826&r1=1212825&r2=1212826&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/installer.proj (original)
+++ qpid/trunk/qpid/packaging/windows/installer.proj Sat Dec 10 17:05:19 2011
@@ -32,6 +32,7 @@
 	<source_root>$(MSBuildProjectDirectory)\..\..</source_root>
 	<staging_dir>$(MSBuildProjectDirectory)\stage</staging_dir>
 	<bits Condition="'$(bits)' == ''">32</bits>
+	<qpid_version>0.14</qpid_version>
 	<OutputName>qpidc</OutputName>
 	<OutputType>Package</OutputType>
 	<WixToolPath>C:\Program Files (x86)\Windows Installer XML v3.5\bin</WixToolPath>
@@ -218,9 +219,9 @@
 	    OutputFile="boost_dlls.wxs" />
 	<Candle
 	    ToolPath="$(WixToolPath)"
-	    DefineConstants="qpidc_version=0.15"
+	    DefineConstants="qpidc_version=$(qpid_version)"
 	    InstallerPlatform="x64"
-	    OutputFile="qpidc-0.15-x64.msi" />
+	    OutputFile="qpidc-$(qpid_version)-x64.msi" />
     -->
         <Exec
 	    Command="heat dir $(staging_dir)\include\qpid -var var.qpid_headers_dir -dr QpidInclude
-gg -cg group_QpidHeaders -out qpid_headers.wxs" />
@@ -230,19 +231,13 @@
 	<Exec
 	    Command="heat dir $(staging_dir)\bin\boost -var var.boost_dll_dir -dr QpidBin -srd -gg
-cg group_BoostDlls -sw5150 -out boost_dlls.wxs" />
 	<Exec
-	    Command="heat file $(staging_dir)\examples\README.txt -var var.examples_dir -dr INSTALLLOCATION
-gg -cg group_Examples -out examples_README.wxs" />
-	<Exec
-	    Command="heat file $(staging_dir)\examples\examples.sln -var var.examples_dir -dr INSTALLLOCATION
-gg -cg group_Examples -out examples_examples.wxs" />
-	<Exec
-	    Command="heat dir $(staging_dir)\examples\messaging -var var.examples_dir -dr INSTALLLOCATION
-gg -cg group_Examples -out examples_messaging.wxs" />
-	<Exec
-	    Command="heat dir $(staging_dir)\examples\qmf-console -var var.examples_dir -dr INSTALLLOCATION
-gg -cg group_Examples -out examples_qmf-console.wxs" />
+	    Command="heat dir $(staging_dir)\examples -var var.examples_dir -dr QpidExamples -srd
-gg -cg group_Examples -out examples.wxs" />
 	<Exec
 	    Command="heat dir $(staging_dir)\docs\api  -var var.api_docs_dir -dr QpidDoc -gg -cg
group_APIDocs -out api_docs.wxs" />
 	<Exec
-	    Command="candle -dqpidc_version=0.15 -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir)
-dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost
-dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api
 -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs
api_docs.wxs -arch $(Architecture)" />
+	    Command="candle -dqpidc_version=$(qpid_version) -dProgramFiles=$(ProgramFiles) -dstaging_dir=$(staging_dir)
-dqpid_headers_dir=$(staging_dir)\include\qpid -dboost_headers_dir=$(staging_dir)\include\boost
-dboost_dll_dir=$(staging_dir)\bin\boost -dexamples_dir=$(staging_dir)\examples -dapi_docs_dir=$(staging_dir)\docs\api
 -ext WiXNetFxExtension qpidc.wxs qpid_headers.wxs boost_headers.wxs boost_dlls.wxs examples.wxs
api_docs.wxs -arch $(Architecture)" />
 	<Exec
-	    Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us
-out qpidc-0.15-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj
boost_dlls.wixobj examples_README.wixobj examples_examples.wixobj examples_messaging.wixobj
examples_qmf-console.wixobj api_docs.wixobj" />
+	    Command="light -ext WiXNetFxExtension -ext WixUtilExtension -ext WixUIExtension -cultures:en-us
-out qpidc-$(qpid_version)-$(Architecture).msi qpidc.wixobj qpid_headers.wixobj boost_headers.wixobj
boost_dlls.wixobj examples.wixobj api_docs.wixobj" />
     </Target>
 
 </Project>

Modified: qpid/trunk/qpid/packaging/windows/qpidc.wxs
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/packaging/windows/qpidc.wxs?rev=1212826&r1=1212825&r2=1212826&view=diff
==============================================================================
--- qpid/trunk/qpid/packaging/windows/qpidc.wxs (original)
+++ qpid/trunk/qpid/packaging/windows/qpidc.wxs Sat Dec 10 17:05:19 2011
@@ -78,8 +78,8 @@
                      Name="PATH" System="yes" Part="last" Value="[QpidBin]"/>
       </Component>
       <Component Id="QpidRootEnv" Guid="{DC89CA24-E66F-4506-AA1F-153A88979AC7}">
-        <Environment Id="RootPath" Separator=";" Action="set" Permanent="no"
-                     Name="QPID_ROOT" System="yes" Part="last"
+        <Environment Id="RootPath" Action="set" Permanent="no"
+                     Name="QPID_ROOT" System="yes" Part="all"
                      Value="[INSTALLLOCATION]"/>
       </Component>
       <Component Id="WCFXAKey" Guid="{88EDD4D2-59FC-46be-BE18-40A94FB5C9D7}">



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message