[xiph-cvs] cvs commit: win32sdk/sdk/build README.examples clean_dist.bat examples.opt mkmak.bat run_tests.bat

Chris Wolf cwolf at xiph.org
Sat Sep 15 01:09:26 PDT 2001



cwolf       01/09/15 01:09:26

  Modified:    .        README.win32sdk all.opt makesdk.bat mkmak.bat
               sdk/build README.examples clean_dist.bat examples.opt
                        mkmak.bat run_tests.bat
  Added:       .        clean_dist.bat clean_libs_mak.bat
  Log:
  Add clean_dist and test scripts

Revision  Changes    Path
1.3       +27 -9     win32sdk/README.win32sdk

Index: README.win32sdk
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/README.win32sdk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README.win32sdk	2001/09/14 03:26:57	1.2
+++ README.win32sdk	2001/09/15 08:09:23	1.3
@@ -1,4 +1,4 @@
-$Id: README.win32sdk,v 1.2 2001/09/14 03:26:57 cwolf Exp $
+$Id: README.win32sdk,v 1.3 2001/09/15 08:09:23 cwolf Exp $
 $Name:  $
 
 win32sdk Readme, 13 September, 2001 Chris Wolf
@@ -33,26 +33,33 @@
   This script will:
 
         1.) create "include", "lib", "bin", "doc" and "examples" 
-      directories and copy the required files from the cvs modules.
+      directories and copy the required files from the dependent 
+      cvs modules (ogg and vorbis libraries).
 
   2.) Using nmake, build the static and dynamic (DLL) libraries 
       and copy them to the sdk\lib directory.  This is accomplished
-      by "makesdk.bat" invoking the "build_all.bat" script.
+      in "makesdk.bat" by invoking the "build_all.bat" script.
 
   Note that the makefiles are generated from the IDE, and are thus a
-  reflection of the workspace and project file states.  It is strongly
+  reflection of the workspace and project file states.  It id strongly
   recommended to make changes via the IDE and export the makefiles,
   rather than tweaking the makefiles directly.
 
 
+  N.B. The script "mkmak.bat" invokes msdev using an automation macro;
+       once invoked, the process runs in the background, so a sleep
+       is added to make sure that all the makefiles are generated before
+       the user attempts to run build_all.bat.  Some slower machines
+       may require more time.
+
+  The following steps are optional. They are for building the libraries
+  in place. The purpose of this step is for libaray development under
+  win32.
 
-  The following steps are optional and only builds the libraries in place.
-  The purpose of this step is for libaray development under win32.
-
   IDE build:
 
   Load the "all.dsw" workspace.  This workspace loads and manages the
-  the dependent project files.  To perform a build, from the "build"
+  the dependent library project files.  To perform a build, from the "build"
   menu, select the "build" menu item.  This will build all the dependent
   libaries, but not copy them.
 
@@ -60,6 +67,17 @@
   this purpose.
 
 INSTALLING
+
   Once prepared, the tree rooted in "sdk" can be used to build
   win32 applications based on Ogg/Vorbis.  See the README in 
-  sdk\examples for further information.
+  sdk\build for further information.
+  
+OTHER SCRIPTS
+
+  clean_all.bat - performs a make clean for each library target in
+                  ogg and vorbis.
+ 
+  clean_libs_mak.bat - deletes the makefiles and their dependecy files
+                       (*.mak, *.dep) in ogg and vorbis
+
+  clean_dist.bat - restores win32sdk to it's freshly checked out state,

1.5       +1191 -208 win32sdk/all.opt

Index: all.opt
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/all.opt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
Binary files /tmp/cvsOjLLcT and /tmp/cvsMRd7yG differ

1.8       +4 -1      win32sdk/makesdk.bat

Index: makesdk.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/makesdk.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makesdk.bat	2001/09/15 06:58:56	1.7
+++ makesdk.bat	2001/09/15 08:09:23	1.8
@@ -1,7 +1,7 @@
 @echo off
 echo ---+++--- Making Win32 SDK ---+++---
 rem
-rem $Id: makesdk.bat,v 1.7 2001/09/15 06:58:56 cwolf Exp $
+rem $Id: makesdk.bat,v 1.8 2001/09/15 08:09:23 cwolf Exp $
 rem
 
 if ."%SRCROOT%"==."" goto notset
@@ -29,6 +29,9 @@
 md sdk\doc\vorbis\vorbisenc
 md sdk\doc\vorbis\vorbisfile
 md sdk\examples\vorbis
+
+attrib +r sdk\build\test.ogg
+attrib +r sdk\build\test.wav
 
 rem --- is ogg here?
 

1.2       +4 -1      win32sdk/mkmak.bat

Index: mkmak.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/mkmak.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mkmak.bat	2001/09/14 03:16:13	1.1
+++ mkmak.bat	2001/09/15 08:09:24	1.2
@@ -1,5 +1,5 @@
 @echo off
-rem $Id: mkmak.bat,v 1.1 2001/09/14 03:16:13 cwolf Exp $
+rem $Id: mkmak.bat,v 1.2 2001/09/15 08:09:24 cwolf Exp $
 rem
 rem This can't be called from the build script because 
 rem it runs asychronously.
@@ -14,7 +14,10 @@
 rem assume they all need to be generated
 rem
 if not exist %SRCROOT%\vorbis\win32\vorbis_dynamic.mak (
+  echo Generating makefiles, please wait...
   msdev -ex ExportMakefile
+  sleep 10
+  echo Done.
 )
 goto done
 

1.1                  win32sdk/clean_dist.bat

Index: clean_dist.bat
===================================================================
@echo off
rem $Id: clean_dist.bat,v 1.1 2001/09/15 08:09:23 cwolf Exp $
rem
rd /s /q Debug\ 2> nul
rd /s /q Release\ 2> nul
rd /s /q sdk\include 2> nul
rd /s /q sdk\lib 2> nul
rd /s /q sdk\bin 2> nul
rd /s /q sdk\doc 2> nul
rd /s /q sdk\examples 2> nul
del *.mak 2> nul
del *.dep 2> nul
del *.plg 2> nul
del *.ncb 2> nul
cd sdk\build
call clean_dist.bat

1.1                  win32sdk/clean_libs_mak.bat

Index: clean_libs_mak.bat
===================================================================
@echo off
rem $Id: clean_libs_mak.bat,v 1.1 2001/09/15 08:09:23 cwolf Exp $
rem
rem Deletes auto generated makefiles in ogg/win32 and vorbis/win32
rem
if ."%SRCROOT%"=="". goto notset
del %SRCROOT%\ogg\win32\*.mak 2> nul
del %SRCROOT%\ogg\win32\*.dep 2> nul
del %SRCROOT%\vorbis\win32\*.mak 2> nul
del %SRCROOT%\vorbis\win32\*.dep 2> nul
goto done

:notset
echo **** SRCROOT must be set
goto done

:done

1.2       +7 -3      win32sdk/sdk/build/README.examples

Index: README.examples
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/README.examples,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.examples	2001/09/14 03:16:14	1.1
+++ README.examples	2001/09/15 08:09:25	1.2
@@ -1,7 +1,7 @@
-$Id: README.examples,v 1.1 2001/09/14 03:16:14 cwolf Exp $
+$Id: README.examples,v 1.2 2001/09/15 08:09:25 cwolf Exp $
 $Name:  $
 =======================================================================
-The SDKHOME directory must be set to where the SDK is rooted,
+The SDKHOME environment variable must be set to where the SDK is rooted,
 including the "sdk" part of the path. 
 e.g. "c:\src\xiph\sdk"
 
@@ -15,5 +15,9 @@
 
 For a command line build, first run "mkmak.bat" to generate
 the makefiles, them run "build_all.bat"
+
+"run_tests.bat" will run each version, of each example program,
+against test data.  The versions are debug-static, release-static,
+debug DLL and release DLL.
 
 "clean_all.bat" will run all the clean targets.

1.2       +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- clean_dist.bat	2001/09/15 07:25:36	1.1
+++ clean_dist.bat	2001/09/15 08:09:25	1.2
@@ -1,5 +1,5 @@
 @echo off
-rem $Id: clean_dist.bat,v 1.1 2001/09/15 07:25:36 cwolf Exp $
+rem $Id: clean_dist.bat,v 1.2 2001/09/15 08:09:25 cwolf Exp $
 rem
 rd /s /q Debug\ 2> nul
 rd /s /q Release\ 2> nul
@@ -7,3 +7,5 @@
 del *.dep 2> nul
 del *.plg 2> nul
 del *.ncb 2> nul
+del out.ogg 2> nul
+del out.pcm 2> nul

1.5       +1101 -18  win32sdk/sdk/build/examples.opt

Index: examples.opt
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/examples.opt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
Binary files /tmp/cvs2O3Jvk and /tmp/cvsmsrhGy differ

1.2       +4 -1      win32sdk/sdk/build/mkmak.bat

Index: mkmak.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/mkmak.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mkmak.bat	2001/09/14 03:16:14	1.1
+++ mkmak.bat	2001/09/15 08:09:25	1.2
@@ -1,5 +1,5 @@
 @echo off
-rem $Id: mkmak.bat,v 1.1 2001/09/14 03:16:14 cwolf Exp $
+rem $Id: mkmak.bat,v 1.2 2001/09/15 08:09:25 cwolf Exp $
 rem
 rem This can't be called from the build script because
 rem it runs asychronously.
@@ -10,7 +10,10 @@
 rem assume they all need to be generated
 rem
 if not exist %SDKHOME%\build\examples.mak (
+   echo Generating makefiles, please wait...
    msdev -ex ExportExampleMakefiles
+   sleep 5
+   echo Done.
 )
 goto done
 

1.2       +14 -1     win32sdk/sdk/build/run_tests.bat

Index: run_tests.bat
===================================================================
RCS file: /usr/local/cvsroot/win32sdk/sdk/build/run_tests.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- run_tests.bat	2001/09/15 07:25:36	1.1
+++ run_tests.bat	2001/09/15 08:09:25	1.2
@@ -1,10 +1,13 @@
 @echo off
-rem $Id: run_tests.bat,v 1.1 2001/09/15 07:25:36 cwolf Exp $
+rem $Id: run_tests.bat,v 1.2 2001/09/15 08:09:25 cwolf Exp $
 rem
 rem  Not using setlocal, so it will work on windows 9x
 set OLDPATH=%PATH%
 set PATH=..\bin
 rem
+if not exist ..\bin\ goto nosdk
+if not exist ..\bin\encoder_static_d.exe goto notbuilt
+
 echo **** encoder_static_d ****
 encoder_static_d test.wav out.ogg
 
@@ -64,6 +67,16 @@
 
 echo **** seeking ****
 seeking test.ogg
+goto done
+
+:nosdk
+echo Error: must build sdk, run win32sdk\makesdk.bat
+goto done
+
+:notbuilt
+echo Error: must build example programs, run build_all.bat
+goto done
 
+:done
 rem not using endlocal, so it will work on windows 9x
 set PATH=%OLDPATH%

--- >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