===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.14
retrieving revision 1.24
diff -u -p -r1.14 -r1.24
--- OpenXM/misc/packages/Windows/Makefile	2002/01/25 02:56:15	1.14
+++ OpenXM/misc/packages/Windows/Makefile	2002/08/10 23:20:02	1.24
@@ -1,27 +1,69 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.13 2002/01/16 09:11:58 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.23 2002/08/10 11:12:31 takayama Exp $
 OpenXM_TOP=../../../../OpenXM
-STARTEXE=c:/windows/command/start.exe
+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: binary-tgz build-tgz clean"
+	@echo "Targets: all build-tgz clean clean-work link-for-debug"
+	@echo "         remove-experimental gen-cd"
+	@echo "Other targets: win-correction3, build-bat"  
 
 clean:
-	-rm -rf OpenXM-win .copy-binary-done .copy-binary-asir-done OpenXM-win.tgz .OpenXM-win.tgz.done oxasir-win.rr
+	-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
 
-binary-tgz: 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
 
-copy-binary:
+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 ; make install-phc) ; \
+		touch .build-binary-openxm-cygwin-done ; \
+	fi
+
+copy-binary: copy-binary-openxm-cygwin
+copy-binary-openxm-cygwin: build-binary-openxm-cygwin
 	-mkdir OpenXM-win
+	-mkdir OpenXM-win/src
 	if [ ! -f .copy-binary-done ] ; then \
 	  (cd OpenXM-win ; \
-	   (cd ../${OpenXM_TOP}; tar czf - bin lib rc man src/asir-contrib) | tar xzvf -  ; \
+	   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 
 
 copy-binary-asir:
+	if [ ! -f .copy-binary-asir-done ] ; then \
+		make copy-binary-asir-from-internet ; \
+	fi
+
+copy-binary-asir-from-internet:
 	-mkdir OpenXM-win
+	if [ ! -d work ] ; then mkdir work ; fi
+	if [ ! -f work/asirwin-${ASIR_LANG}.tgz ] ; then \
+		(cd work ; wget ${WGET_ARG} ) ; \
+	fi
+	(cd OpenXM-win ; tar xzvf ../work/asirwin-${ASIR_LANG}.tgz)
+	touch .copy-binary-asir-done
+
+copy-binary-asir-from-local-disk:
+	-mkdir OpenXM-win
 	-mkdir OpenXM-win/asir
 	if [ ! -f .copy-binary-asir-done ] ; then \
 	 (cd OpenXM-win ; \
@@ -30,34 +72,55 @@ copy-binary-asir:
 	  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 ; \
+	 cp /bin/cygwin1.dll OpenXM-win/bin ; \
+	 cp /bin/cygwin1.dll OpenXM-win/lib/sm1/bin ; \
+	 cp /usr/X11R6/bin/*.dll OpenXM-win/asir/bin ; \
+	 cp /usr/X11R6/bin/*.dll OpenXM-win/bin ; \
+	 touch .copy-cygwin-dlls-done ; \
+	fi
+
 win-correction: copy-binary oxasir-win.rr
 	make win-correction2 
-win-correction1: build-bat
+win-correction1: build-bat copy-cygwin-dlls
 	-mkdir OpenXM-win/bin-windows
-	cp ${STARTEXE} OpenXM-win/bin-windows
-	cp /bin/cygwin1.dll OpenXM-win/bin-windows
-	cp /bin/cygwin1.dll OpenXM-win/bin
-	cp /bin/cygwin1.dll OpenXM-win/lib/sm1/bin
 #	(cd OpenXM-win/rc ; make clean ; make)
 win-correction2: win-correction1
-	cp ${STARTEXE} OpenXM-win/bin
-	cp ${STARTEXE} OpenXM-win/asir/bin
-	cp /usr/X11R6/bin/*.dll OpenXM-win/asir/bin
-	cp /usr/X11R6/bin/*.dll OpenXM-win/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
 	cp OpenXM-win/lib/sm1/*.sm1 OpenXM-win/bin
 	cp OpenXM-win/lib/sm1/oxasir.asir OpenXM-win/asir/bin
 	cp OpenXM-win/lib/sm1/oxasir.asir OpenXM-win/bin
-	cp OpenXM-win/bin/ox_asir OpenXM-win/bin/ox_asir.exe
+	-cp OpenXM-win/bin/ox_asir OpenXM-win/bin/ox_asir.exe
 	cp oxasir-win.rr OpenXM-win/bin
 	cp oxasir-win.rr OpenXM-win/asir/bin
 	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
-	-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 ; \
@@ -66,6 +129,9 @@ build-tgz: win-correction-clean
 copy-to-orange: build-tgz
 	scp OpenXM-win.tgz taka@orange:tmp3
 
+link-for-debug:
+	(cd ${OpenXM_TOP} ; cd bin ; ln -s ../../OpenXM_contrib2/asir2000/asir .)
+	(cd ${OpenXM_TOP} ; cd src/kxx ; make install-for-debug)
 
 oxapp : oxapp.c
 
@@ -78,11 +144,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."