[xiph-cvs] cvs commit: win32sdk all.opt build_all.bat makesdk.bat mfmacro.bat

[Chris Wolf]

cwolf       01/09/13 18:26:31

  Modified:    .        all.opt build_all.bat makesdk.bat mfmacro.bat
  Log:
  Fix some build bugs

Revision  Changes    Path
1.2       +213 -382  win32sdk/all.opt

Index: all.opt
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/all.opt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
Binary files /tmp/cvsurfJ6S and /tmp/cvs4a9EsG differ

1.3       +4 -2      win32sdk/build_all.bat

Index: build_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/build_all.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build_all.bat	2001/09/13 21:36:24	1.2
+++ build_all.bat	2001/09/14 01:26:30	1.3
@@ -1,5 +1,5 @@
 @echo off
-rem $Id: build_all.bat,v 1.2 2001/09/13 21:36:24 cwolf Exp $
+rem $Id: build_all.bat,v 1.3 2001/09/14 01:26:30 cwolf Exp $
 rem
 rem Invoke as "build_all.bat CLEAN" to clean all targets
 rem
@@ -36,7 +36,7 @@
 nmake /nologo /F .\vorbisfile_static.mak CFG="vorbisfile_static - Win32 Debug" %1
 nmake /nologo /F .\vorbisfile_static.mak CFG="vorbisfile_static - Win32 Release" %1
 cd "..\..\win32sdk"
-exit
+goto normal
 
 :noogg
 echo ***** Need module OGG -- not present
@@ -49,3 +49,5 @@
 :notset
 echo ***** Error: must set SRCROOT
 exit
+
+:normal

1.5       +8 -11     win32sdk/makesdk.bat

Index: makesdk.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/makesdk.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makesdk.bat	2001/09/13 19:55:00	1.4
+++ makesdk.bat	2001/09/14 01:26:30	1.5
@@ -1,7 +1,7 @@
- at echo off
+rem @echo off
 echo ---+++--- Making Win32 SDK ---+++---
 rem
-rem $Id: makesdk.bat,v 1.4 2001/09/13 19:55:00 cwolf Exp $
+rem $Id: makesdk.bat,v 1.5 2001/09/14 01:26:30 cwolf Exp $
 rem
 
 if ."%SRCROOT%"==."" goto notset
@@ -15,20 +15,17 @@
   msdev -ex ExportMakefile
 )
   
-rd /s /q sdk > nul
-md sdk
-md sdk\include
+rd /s /q sdk\include > nul
+rd /s /q sdk\lib > nul
+rd /s /q sdk\bin > nul
+rd /s /q sdk\doc > nul
 md sdk\include\ogg
 md sdk\include\vorbis
 md sdk\lib
 md sdk\bin
-md sdk\doc
-md sdk\doc\ogg
 md sdk\doc\ogg\ogg
-md sdk\doc\vorbis
 md sdk\doc\vorbis\vorbisenc
 md sdk\doc\vorbis\vorbisfile
-md sdk\examples
 md sdk\examples\vorbis
 
 rem --- is ogg here?
@@ -90,7 +87,7 @@
 
 echo Copying examples...
 
-xcopy %SRCROOT%\vorbis\examples\*.c %SRCROOT%\win32sdk\sdk\examples\vorbis
+xcopy /y %SRCROOT%\vorbis\examples\*.c %SRCROOT%\win32sdk\sdk\examples\vorbis
 
 echo ... copied.
 
@@ -125,7 +122,7 @@
 if errorlevel 1 goto ERROR
 xcopy %SRCROOT%\vorbis\win32\Vorbis_Dynamic_Debug\vorbis_d.pdb %SRCROOT%\win32sdk\sdk\lib > nul
 if errorlevel 1 goto ERROR
-xcopy %SRCROOT%\vorbis\win32\Vorbis_Dynamic_Debug\vorbis_d.dll %SRCROOT%\win32sdk\sdk\bin > nul
+xcopy %SRCROOT%\vorbis\win32\Vorbis_Dynamic_Debug\vorbis_d.dll %SRCROOT%\win32sdk\sdk\bin 
 if errorlevel 1 goto ERROR
 xcopy %SRCROOT%\vorbis\win32\VorbisFile_Static_Release\vorbisfile_static.lib %SRCROOT%\win32sdk\sdk\lib > nul
 if errorlevel 1 goto ERROR

1.2       +13 -1     win32sdk/mfmacro.bat

Index: mfmacro.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/mfmacro.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mfmacro.bat	2001/09/13 19:55:00	1.1
+++ mfmacro.bat	2001/09/14 01:26:30	1.2
@@ -1,5 +1,5 @@
 rem @echo off
-rem $Id: mfmacro.bat,v 1.1 2001/09/13 19:55:00 cwolf Exp $
+rem $Id: mfmacro.bat,v 1.2 2001/09/14 01:26:30 cwolf Exp $
 rem Creates and installs VC macro for exporting makefiles from 
 rem the command line.
 rem
@@ -16,6 +16,18 @@
 echo   Application.Visible = False >> %macrofile%
 echo   Documents.Open "%SRCROOT%\win32sdk\all.dsw",,True >> %macrofile%
 echo   set ActiveProject = Projects("all") >> %macrofile%
+echo   Application.ExecuteCommand "BuildProjectExport" >> %macrofile%
+echo   Documents.SaveAll True >> %macrofile%
+echo   Application.Quit >> %macrofile%
+echo end Sub >> %macrofile%
+echo ' >> %macrofile%
+echo 'This macro is for exporting makefiles for example projects >> %macrofile%
+echo 'from the command line. >> %macrofile%
+echo 'To invoke: msdev -ex ExportMakefile
+echo Sub ExportExampleMakefiles >> %macrofile%
+echo   Application.Visible = False >> %macrofile%
+echo   Documents.Open "%SRCROOT%\win32sdk\sdk\build\examples.dsw",,True >> %macrofile%
+echo   set ActiveProject = Projects("examples") >> %macrofile%
 echo   Application.ExecuteCommand "BuildProjectExport" >> %macrofile%
 echo   Documents.SaveAll True >> %macrofile%
 echo   Application.Quit >> %macrofile%

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.