[xiph-cvs] cvs commit: win32sdk/sdk/build build_all.bat clean_all.bat clean_dist.bat mkmak.bat
Chris Wolf
cwolf at xiph.org
Sat Oct 20 14:12:38 PDT 2001
cwolf 01/10/20 14:12:38
Modified: . README.win32sdk build_all.bat clean_all.bat
clean_dist.bat makesdk.bat mkmak.bat
sdk/build build_all.bat clean_all.bat clean_dist.bat
mkmak.bat
Removed: . mfmacro.bat
Log:
default to building with msdev workspaces, use Matthijs Laan export script
Revision Changes Path
1.8 +14 -7 win32sdk/README.win32sdk
Index: README.win32sdk
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/README.win32sdk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- README.win32sdk 2001/10/18 17:52:07 1.7
+++ README.win32sdk 2001/10/20 21:12:33 1.8
@@ -1,4 +1,4 @@
-$Id: README.win32sdk,v 1.7 2001/10/18 17:52:07 cwolf Exp $
+$Id: README.win32sdk,v 1.8 2001/10/20 21:12:33 cwolf Exp $
$Name: $
win32sdk Readme, 13 September, 2001 Chris Wolf
@@ -18,6 +18,7 @@
cvs modules "ogg", "vorbis" and "win32sdk" (this module) are
required for this build.
+
QUICK SUMMARY
1.) run makesdk.bat
@@ -25,15 +26,24 @@
3.) run build_all.bat
4.) run run_tests.bat
+
+BUILD USING NMAKE
+
+ By default, the scripts will build using msdev workspaces and
+ project files. In the case where the sdk may be moved to an
+ environment which does not have MSVC v6, the build may be
+ performed using NMAKE. When the build is performed this way,
+ makefiles are generated, which should work in older versions
+ of MSVC. In order to do this, set the environment
+ variable "USENMAKE" to "true" (actually, any value will work).
- If there are build problems, try the following three steps
- before performing the above mentioned four steps.
+ If there are nmake build problems, try the following three steps
+ before performing the build again.
1.) run clean_libs_mak.bat
2.) run mkmak.bat
3.) run clean_all.bat
-
BUILDING
The following steps are optional. They are for building the libraries
@@ -82,8 +92,5 @@
mkmak.bat - creates makefiles and dependency files in the ogg and
vorbis modules.
-
- mfmacro.bat - creates an MSVC macro used for makefile
- generation from the command line.
sdk\build\mkmak.bat - creates makefiles for the example programs
1.8 +17 -9 win32sdk/build_all.bat
Index: build_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/build_all.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build_all.bat 2001/10/18 17:21:59 1.7
+++ build_all.bat 2001/10/20 21:12:34 1.8
@@ -1,23 +1,31 @@
@echo off
-rem $Id: build_all.bat,v 1.7 2001/10/18 17:21:59 cwolf Exp $
+rem $Id: build_all.bat,v 1.8 2001/10/20 21:12:34 cwolf Exp $
rem
+rem Use NMAKE to build/clean
+rem
rem Invoke as "build_all.bat CLEAN" to clean all targets
rem
if ."%SRCROOT%"==."" goto notset
+if not exist %SRCROOT%\ogg\include\ogg\ogg.h goto noogg
+if not exist %SRCROOT%\vorbis\include\vorbis\codec.h goto novorbis
+
+rem compile execwait utility
+if not exist execwait.exe (
+ cl /nologo execwait.c
+)
+
+if ."%USENMAKE%"==."" (
+ msdev all.dsw /make "all - ALL"
+ goto done
+)
+
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
-rem Makefile generation is asychronous, so it cannot be
-rem called inline with this script.
if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
-rem echo Error: must invoke "mkmak.bat" first
-rem goto done
-call mkmak.bat
+ call mkmak.bat
)
-
-if not exist %SRCROOT%\ogg\include\ogg\ogg.h goto noogg
-if not exist %SRCROOT%\vorbis\include\vorbis\codec.h goto novorbis
cd "..\ogg\win32"
nmake /nologo /F .\ogg_dynamic.mak CFG="ogg_dynamic - Win32 Debug" %1
1.3 +6 -2 win32sdk/clean_all.bat
Index: clean_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/clean_all.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clean_all.bat 2001/09/15 07:03:06 1.2
+++ clean_all.bat 2001/10/20 21:12:34 1.3
@@ -1,6 +1,10 @@
@echo off
rem
-rem $Id: clean_all.bat,v 1.2 2001/09/15 07:03:06 cwolf Exp $
+rem $Id: clean_all.bat,v 1.3 2001/10/20 21:12:34 cwolf Exp $
rem Call the make clean targets in each respective modules' subdirectory
rem
-call build_all.bat CLEAN 2> nul
+if ."%USENMAKE%"==."" (
+ msdev all.dsw /make "all - ALL" /clean /out clean.out
+) else (
+ call build_all.bat CLEAN 2> nul
+)
1.2 +3 -1 win32sdk/clean_dist.bat
Index: clean_dist.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/clean_dist.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clean_dist.bat 2001/09/15 08:09:23 1.1
+++ clean_dist.bat 2001/10/20 21:12:34 1.2
@@ -1,5 +1,5 @@
@echo off
-rem $Id: clean_dist.bat,v 1.1 2001/09/15 08:09:23 cwolf Exp $
+rem $Id: clean_dist.bat,v 1.2 2001/10/20 21:12:34 cwolf Exp $
rem
rd /s /q Debug\ 2> nul
rd /s /q Release\ 2> nul
@@ -12,5 +12,7 @@
del *.dep 2> nul
del *.plg 2> nul
del *.ncb 2> nul
+del clean.out 2> null
+del build.out 2> null
cd sdk\build
call clean_dist.bat
1.13 +9 -13 win32sdk/makesdk.bat
Index: makesdk.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/makesdk.bat,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- makesdk.bat 2001/10/18 17:21:59 1.12
+++ makesdk.bat 2001/10/20 21:12:34 1.13
@@ -1,7 +1,7 @@
@echo off
echo ---+++--- Making Win32 SDK ---+++---
rem
-rem $Id: makesdk.bat,v 1.12 2001/10/18 17:21:59 cwolf Exp $
+rem $Id: makesdk.bat,v 1.13 2001/10/20 21:12:34 cwolf Exp $
rem
if ."%SRCROOT%"==."" goto notset
@@ -13,13 +13,6 @@
cl /nologo execwait.c
)
-rem If one of the makefiles doesn't exist,
-rem assume they all need to be generated
-rem
-if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
- call mkmak.bat
-)
-
rd /s /q sdk\include 2> nul
rd /s /q sdk\lib 2> nul
rd /s /q sdk\bin 2> nul
@@ -65,6 +58,13 @@
echo ... vorbis found.
+
+rem --- build all
+echo Building libraries...
+call build_all.bat
+if errorlevel 1 goto ERROR
+
+
rem --- copy include files into sdk
echo Copying include files...
@@ -102,10 +102,6 @@
echo ... copied.
-rem --- build all
-echo Building libraries...
-call build_all.bat
-if errorlevel 1 goto ERROR
xcopy %SRCROOT%\ogg\win32\Static_Release\ogg_static.lib %SRCROOT%\win32sdk\sdk\lib > nul
if errorlevel 1 goto ERROR
@@ -168,7 +164,7 @@
:ERROR
-echo Some error(s) occurred. Fix it.
+echo Some error(s) occurred. See output above...
goto EXIT
:notset
1.7 +2 -10 win32sdk/mkmak.bat
Index: mkmak.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/mkmak.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mkmak.bat 2001/10/18 17:21:59 1.6
+++ mkmak.bat 2001/10/20 21:12:34 1.7
@@ -1,25 +1,17 @@
@echo off
-rem $Id: mkmak.bat,v 1.6 2001/10/18 17:21:59 cwolf Exp $
+rem $Id: mkmak.bat,v 1.7 2001/10/20 21:12:34 cwolf Exp $
rem
rem
if ."%SRCROOT%"==."" goto notset
-rem Create and install MSVC macros, if needed
-call mfmacro.bat
-if errorlevel 1 goto error
-
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
echo Generating makefiles, please wait...
- execwait msdev -ex ExportMakefile
+ execwait %SystemRoot%\system32\cscript.exe //nologo exportmf.js
echo Done.
)
-goto done
-
-:error
-echo **** Error: couldn't create or install macro
goto done
:notset
1.6 +7 -1 win32sdk/sdk/build/build_all.bat
Index: build_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/build_all.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build_all.bat 2001/10/18 17:22:00 1.5
+++ build_all.bat 2001/10/20 21:12:37 1.6
@@ -1,5 +1,5 @@
@echo off
-rem $Id: build_all.bat,v 1.5 2001/10/18 17:22:00 cwolf Exp $
+rem $Id: build_all.bat,v 1.6 2001/10/20 21:12:37 cwolf Exp $
rem
rem Invoke as "build_all.bat CLEAN" to clean all targets
rem
@@ -19,11 +19,17 @@
if not exist %SDKHOME%\lib\ogg.lib goto nolib
+if ."%USENMAKE%"==."" (
+ msdev examples.dsw /make "examples - ALL"
+ goto done
+)
+
rem If one of the makefiles doesn't exist,
rem assume they all need to be generated
rem
if not exist %SDKHOME%\build\examples.mak (
call mkmak.bat
+rem execwait %SystemRoot%\system32\cscript.exe exportmf.js
)
nmake /nologo /f encoder.mak CFG="encoder - Win32 Debug" %1
1.3 +6 -2 win32sdk/sdk/build/clean_all.bat
Index: clean_all.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/clean_all.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- clean_all.bat 2001/10/20 17:58:24 1.2
+++ clean_all.bat 2001/10/20 21:12:37 1.3
@@ -1,6 +1,10 @@
@echo off
rem
-rem $Id: clean_all.bat,v 1.2 2001/10/20 17:58:24 cwolf Exp $
+rem $Id: clean_all.bat,v 1.3 2001/10/20 21:12:37 cwolf Exp $
rem Call the make clean targets for each example program target
rem
-call build_all.bat CLEAN 2> nul
+if ."%USENMAKE%"==."" (
+ msdev examples.dsw /make "examples - ALL" /clean /out clean.out
+) else (
+ call build_all.bat CLEAN 2> nul
+)
1.5 +3 -1 win32sdk/sdk/build/clean_dist.bat
Index: clean_dist.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/clean_dist.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clean_dist.bat 2001/10/18 17:22:00 1.4
+++ clean_dist.bat 2001/10/20 21:12:37 1.5
@@ -1,5 +1,5 @@
@echo off
-rem $Id: clean_dist.bat,v 1.4 2001/10/18 17:22:00 cwolf Exp $
+rem $Id: clean_dist.bat,v 1.5 2001/10/20 21:12:37 cwolf Exp $
rem
rd /s /q Debug\ 2> nul
rd /s /q Release\ 2> nul
@@ -10,3 +10,5 @@
del out.ogg 2> nul
del out.pcm 2> nul
del execwait.exe 2> nul
+del clean.out 2> nul
+del build.out 2> nul
1.5 +2 -2 win32sdk/sdk/build/mkmak.bat
Index: mkmak.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/mkmak.bat,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mkmak.bat 2001/10/18 17:22:00 1.4
+++ mkmak.bat 2001/10/20 21:12:37 1.5
@@ -1,5 +1,5 @@
@echo off
-rem $Id: mkmak.bat,v 1.4 2001/10/18 17:22:00 cwolf Exp $
+rem $Id: mkmak.bat,v 1.5 2001/10/20 21:12:37 cwolf Exp $
rem
rem
if ."%SDKHOME%"==."" goto notset
@@ -9,7 +9,7 @@
rem
if not exist %SDKHOME%\build\examples.mak (
echo Generating makefiles, please wait...
- execwait msdev -ex ExportExampleMakefiles
+ execwait %SystemRoot%\system32\cscript.exe //nologo exportmf.js
echo Done.
)
goto done
--- >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.
More information about the commits
mailing list