===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.16
retrieving revision 1.22
diff -u -p -r1.16 -r1.22
--- OpenXM/misc/packages/Windows/Makefile	2002/07/28 07:04:22	1.16
+++ OpenXM/misc/packages/Windows/Makefile	2002/08/10 07:05:47	1.22
@@ -1,23 +1,31 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.15 2002/07/28 06:31:01 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.21 2002/08/09 07:51:28 fujimoto Exp $
 OpenXM_TOP=../../../../OpenXM
 ASIR_LANG=ja
 #ASIR_LANG=en
+VERSION=1.2.2
 WGET_ARG=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/asir/asirwin-${ASIR_LANG}.tgz
+WGET_PHC=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/phc.exe
+WGET_HEAD=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/Head/openxm-head.tar.gz
 
-STARTEXE=c:/windows/command/start.exe
 WINASIR=c:/home/asir
 
 usage:
 	@echo "Targets: all build-tgz clean clean-work link-for-debug"
+	@echo "         remove-experimental gen-cd"
 
 clean:
-	-rm -rf OpenXM-win .copy-binary-done .copy-binary-asir-done OpenXM-win.tgz .OpenXM-win.tgz.done oxasir-win.rr .copy-cygwin-dlls-done .build-binary-openxm-cygwin-done
+	-rm -rf OpenXM-win .copy-binary-done .copy-binary-asir-done .copy-binary-phc-done OpenXM-win.tgz .OpenXM-win.tgz.done oxasir-win.rr .copy-cygwin-dlls-done .build-binary-openxm-cygwin-done OpenXM-unix OpenXM-doc
 
-all: copy-binary copy-binary-asir win-correction
+clean-work:
+	-rm -rf work
+clean0:
+	-rm -rf .copy-binary-done oxasir-win.rr .copy-cygwin-dlls-done
 
+all: copy-binary-phc copy-binary copy-binary-asir win-correction win-correction-clean
+
 build-binary-openxm-cygwin:
 	if [ ! -f .build-binary-openxm-cygwin-done ] ; then \
-		(cd ${OpenXM_TOP}/src ; make install-kan-ox ) ; \
+		(cd ${OpenXM_TOP}/src ; make install-kan-ox ; make install-phc) ; \
 		touch .build-binary-openxm-cygwin-done ; \
 	fi
 
@@ -27,13 +35,15 @@ copy-binary-openxm-cygwin: build-binary-openxm-cygwin
 	-mkdir OpenXM-win/src
 	if [ ! -f .copy-binary-done ] ; then \
 	  (cd OpenXM-win ; \
-	   rsync -avz --delete ../${OpenXM_TOP}/bin . ; \
-	   rsync -avz --delete ../${OpenXM_TOP}/lib . ; \
-	   rsync -avz --delete ../${OpenXM_TOP}/rc . ; \
-	   rsync -avz --delete ../${OpenXM_TOP}/man . ; \
-	   rsync -avz --delete ../${OpenXM_TOP}/src/asir-contrib src ; \
+	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/bin . ; \
+	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/lib . ; \
+	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/rc . ; \
+	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/man . ; \
+	   rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/src/asir-contrib src ; \
+	   find . -name 'CVS' -print | xargs rm -rf ; \
 	  ) ; \
-	   cp readme-ja.html OpenXM-win ; \
+	   cp Readme-CD/readme-ja.html OpenXM-win ; \
+	   cp Readme-CD/readme-en.html OpenXM-win ; \
 	   touch .copy-binary-done ; \
 	fi 
 
@@ -61,6 +71,17 @@ copy-binary-asir-from-local-disk:
 	  touch .copy-binary-asir-done ; \
 	fi
 
+copy-binary-phc:
+	if [ ! -f .copy-binary-phc-done ] ; then \
+		make copy-binary-phc-from-internet ; \
+	fi
+
+copy-binary-phc-from-internet:
+	if [ ! -f ${OpenXM_TOP}/bin/phc.exe ] ; then \
+	 (cd ${OpenXM_TOP}/bin ; wget ${WGET_PHC} ) ; \
+	fi
+	touch .copy-binary-phc-done
+
 copy-cygwin-dlls:
 	if [ ! -f .copy-cygwin-dlls-done ] ; then \
 	 cp /bin/cygwin1.dll OpenXM-win/bin-windows ; \
@@ -75,11 +96,8 @@ win-correction: copy-binary oxasir-win.rr
 	make win-correction2 
 win-correction1: build-bat copy-cygwin-dlls
 	-mkdir OpenXM-win/bin-windows
-	-cp ${STARTEXE} OpenXM-win/bin-windows
 #	(cd OpenXM-win/rc ; make clean ; make)
 win-correction2: win-correction1
-	-cp ${STARTEXE} OpenXM-win/bin
-	-cp ${STARTEXE} OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/bin
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/asir/bin
@@ -93,8 +111,8 @@ win-correction2: win-correction1
 	cp oxasir-win.rr OpenXM-win/lib/sm1
 
 win-correction-clean:
-	-find OpenXM-win -name '*~' -print | xargs rm
-	-rm OpenXM-win/lib/sm1/*.jpeg OpenXM-win/lib/sm1/*.jpg
+	-find OpenXM-win -name '*~' -print | xargs rm -f
+	-rm -f OpenXM-win/lib/sm1/*.jpeg OpenXM-win/lib/sm1/*.jpg
 build-tgz: win-correction-clean
 	if [ ! -f .OpenXM-win.tgz.done ]; then \
 	tar czvf OpenXM-win.tgz OpenXM-win ; touch .OpenXM-win.tgz.done ; \
@@ -118,11 +136,25 @@ oxasir-win.rr : oxapp oxpp oxpp2
 
 debug-tools/crlf :  debug-tools/crlf.c
 	(cd debug-tools; gcc -o crlf crlf.c)
-build-bat: debug-tools/crlf
+debug-tools/debug-sed : debug-tools/debug-sed.c
+	(cd debug-tools; gcc -o debug-sed debug-sed.c)
+build-bat: debug-tools/crlf debug-tools/debug-sed
 	-mkdir OpenXM-win/bin-windows
 	(cd debug-tools; sed -f dist.sed <asirgui-cd.bat >../OpenXM-win/bin-windows/asirgui-cd.bat ; ./crlf ../OpenXM-win/bin-windows/asirgui-cd.bat)
 	(cd debug-tools; sed -f dist.sed <webasir.bat >../OpenXM-win/bin-windows/webasir.bat ; ./crlf ../OpenXM-win/bin-windows/webasir.bat)
 	(cd debug-tools; sed -f dist.sed <websm1.bat >../OpenXM-win/bin-windows/websm1.bat ; ./crlf ../OpenXM-win/bin-windows/websm1.bat)
 	(rm -f ../OpenXM-win/bin-windows/*.BAK ../OpenXM-win/bin-windows/*.bak)
 	cp OpenXM-win/bin-windows/asirgui-cd.bat OpenXM-win/asir/bin
+	rm -f debug-tools/debug.sed ; debug-tools/debug-sed `pwd` >debug-tools/debug.sed
+	(cd debug-tools; sed -f debug.sed <asirgui-cd.bat >asirgui-debug.bat ; ./crlf asirgui-debug.bat)
 
+remove-experimental:
+	-rm -f OpenXM-win/bin-windows/*web*.bat
+
+
+gen-cd:
+	-(make all; make remove-experimental)
+	-mkdir OpenXM-unix
+	cp Readme-CD/readme-unix-en.html OpenXM-unix
+	(cd OpenXM-unix; wget ${WGET_HEAD} )
+	@echo "Copy OpenXM-unix and OpenXM-win to the CD."
\ No newline at end of file