===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.18
retrieving revision 1.26
diff -u -p -r1.18 -r1.26
--- OpenXM/misc/packages/Windows/Makefile	2002/07/30 00:28:00	1.18
+++ OpenXM/misc/packages/Windows/Makefile	2002/09/29 01:31:10	1.26
@@ -1,25 +1,35 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.17 2002/07/28 08:10:24 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.25 2002/08/15 00:03:28 takayama 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
 
 WINASIR=c:/home/asir
 
 usage:
 	@echo "Targets: all build-tgz clean clean-work link-for-debug"
-	@echo "         remove-experimental "
+	@echo "         remove-experimental gen-cd"
+	@echo "  The target all, gen-cd builds the directory OpenXM-win" 
+	@echo "Other targets: win-correction3, build-bat"  
+	@echo "               asir-book "
 
-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
+clean: clean-OpenXM-win clean-asir-book
+clean-OpenXM-win:
+	-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 
+
 clean-work:
 	-rm -rf work
+clean0:
+	-rm -rf .copy-binary-done oxasir-win.rr .copy-cygwin-dlls-done
 
-all: copy-binary copy-binary-asir win-correction win-correction-clean
+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
 
@@ -29,14 +39,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 
 
@@ -64,6 +75,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 ; \
@@ -92,6 +114,13 @@ win-correction2: win-correction1
 	cp oxasir-win.rr OpenXM-win/lib/asir
 	cp oxasir-win.rr OpenXM-win/lib/sm1
 
+## it is for an obsolete asirwin-*.tgz
+win-correction3: debug-tools/crlf
+	cp ${OpenXM_TOP}/../OpenXM_contrib2/asir2000/lib/xm OpenXM-win/asir/lib
+	cp ${OpenXM_TOP}/../OpenXM_contrib2/asir2000/lib/glib OpenXM-win/asir/lib
+	./debug-tools/crlf OpenXM-win/asir/lib/xm
+	./debug-tools/crlf OpenXM-win/asir/lib/glib
+
 win-correction-clean:
 	-find OpenXM-win -name '*~' -print | xargs rm -f
 	-rm -f OpenXM-win/lib/sm1/*.jpeg OpenXM-win/lib/sm1/*.jpg
@@ -134,3 +163,48 @@ remove-experimental:
 	-rm -f OpenXM-win/bin-windows/*web*.bat
 
 
+gen-cd:
+	-(make ASIR_LANG=${ASIR_LANG} 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."
+
+asir-book: mkdir-asir-book copy-to-asir-book
+clean-asir-book:
+	-rm -rf asir-book .copy-to-asir-book-asir-bin .copy-to-asir-book-prog .copy-to-asir-book-meadow
+
+mkdir-asir-book: 
+	-(mkdir asir-book)
+	-(mkdir asir-book/asir)
+	-(mkdir asir-book/Meadow)
+	-(mkdir asir-book/Prog)
+
+copy-to-asir-book:  copy-to-asir-book-asir-bin copy-to-asir-book-prog copy-to-asir-book-meadow asir-book/index.html
+
+copy-to-asir-book-asir-bin:  copy-binary-asir
+	if [ ! -f .copy-to-asir-book-asir-bin ] ; then  \
+	  -(cd asir-book ; tar xzvf ../work/asirwin-${ASIR_LANG}.tgz) ;\
+	fi
+	touch .copy-to-asir-book-asir-bin
+
+copy-to-asir-book-prog:
+	if [ ! -f .copy-to-asir-book-prog ] ; then \
+	  (cd work; cvs-asir-book checkout asir-book) ; \
+	  (cp work/asir-book/Prog/*.rr asir-book/Prog) ; \
+	fi
+	touch .copy-to-asir-book-prog
+
+MEADOW=meadow-xxx.exe
+WGET_MEADOW=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/${MEADOW}
+copy-to-asir-book-meadow:
+	if [ ! -f .copy-to-asir-book-meadow ] ; then \
+	 if [ ! -f work/${MEADOW} ] ; then \
+		(cd work ; wget ${WGET_MEADOW} ) ; \
+	 fi ; \
+	 (cd asir-book ; cp ../work/${MEADOW} asir-book/Meadow) ; \
+	fi
+	touch .copy-to-asir-book-meadow
+
+asir-book/index.html: Readme-CD/asir-book-index.html
+	cp Readme-CD/asir-book-index.html asir-book/index.html