[WiX-commits] wix/src/ct/setupbld setupbld.build,1.1,1.2

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix/src/ct/setupbld
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7066/src/ct/setupbld

Modified Files:
	setupbld.build 
Log Message:
ct - fix build scripts to not create infinite loops in DLL import tables

Index: setupbld.build
===================================================================
RCS file: /cvsroot/wix/wix/src/ct/setupbld/setupbld.build,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setupbld.build	7 Nov 2005 22:47:31 -0000	1.1
--- setupbld.build	8 Nov 2005 11:59:31 -0000	1.2
***************
*** 90,109 ****
        </sourcefiles>
        <targetfiles basedir="${dir.build.ct.setupbld}\dll">
          <include name="SetupBuilder.lib" />
          <include name="SetupBuilder.exp" />
        </targetfiles>
      </uptodate>
!     <lib output="${dir.build.ct.setupbld}\dll\SetupBuilder.lib" options="${lib.standardOptions} -def:&quot;${dir.src.ct}\setupbld\dll\SetupBuilder.def&quot;" unless="${setupbld.libuptodate}">
        <sources basedir="${dir.build.ct.setupbld}\dll">
          <include name="main.obj" />
          <include name="precomp.obj"/>
        </sources>
!     </lib>
  
      <!-- Link the final SetupBuilder.dll -->
!     <link output="${setupbld.file.dll.target}" options="${link.standardOptions} -dll ${link.standardLibs}">
        <sources basedir="${dir.build.ct.setupbld}\dll">
!         <include name="SetupBuilder.lib" />
!         <include name="SetupBuilder.exp" />
        </sources>
      </link>
--- 90,110 ----
        </sourcefiles>
        <targetfiles basedir="${dir.build.ct.setupbld}\dll">
+         <include name="SetupBuilder.dll" />
          <include name="SetupBuilder.lib" />
          <include name="SetupBuilder.exp" />
        </targetfiles>
      </uptodate>
!     <!--lib output="${dir.build.ct.setupbld}\dll\SetupBuilder.lib" options="${lib.standardOptions}" unless="${setupbld.libuptodate}">
        <sources basedir="${dir.build.ct.setupbld}\dll">
          <include name="main.obj" />
          <include name="precomp.obj"/>
        </sources>
!     </lib-->
  
      <!-- Link the final SetupBuilder.dll -->
!     <link output="${setupbld.file.dll.target}" options="${link.standardOptions} -def:&quot;${dir.src.ct}\setupbld\dll\SetupBuilder.def&quot; -dll ${link.standardLibs}" unless="${setupbld.libuptodate}">
        <sources basedir="${dir.build.ct.setupbld}\dll">
!         <include name="main.obj" />
!         <include name="precomp.obj"/>
        </sources>
      </link>
***************
*** 147,151 ****
      <link output="${setupbld.file.exe.target}" options="${link.standardOptions} -entry:wmainCRTStartup ${link.standardLibs}">
        <sources basedir="${dir.build.ct.setupbld}\exe">
!         <include name="${dir.build.ct.setupbld}\dll\SetupBuilder.lib" />
          <include name="main.obj" />
          <include name="precomp.obj" />
--- 148,152 ----
      <link output="${setupbld.file.exe.target}" options="${link.standardOptions} -entry:wmainCRTStartup ${link.standardLibs}">
        <sources basedir="${dir.build.ct.setupbld}\exe">
!         <include name="${dir.target.wix}\SetupBuilder.lib" />
          <include name="main.obj" />
          <include name="precomp.obj" />