===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v
retrieving revision 1.26
retrieving revision 1.32
diff -u -p -r1.26 -r1.32
--- OpenXM/misc/packages/Windows/Makefile	2002/09/29 01:31:10	1.26
+++ OpenXM/misc/packages/Windows/Makefile	2003/07/16 05:19:49	1.32
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.25 2002/08/15 00:03:28 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.31 2002/10/01 00:05:54 takayama Exp $
 OpenXM_TOP=../../../../OpenXM
 ASIR_LANG=ja
 #ASIR_LANG=en
@@ -10,15 +10,15 @@ WGET_HEAD=--passive-ftp ftp://ftp:${USER}.openxm.org@f
 WINASIR=c:/home/asir
 
 usage:
-	@echo "Targets: all build-tgz clean clean-work link-for-debug"
+	@echo "Targets: all build-tgz clean clean-work link-for-debug copy-to-ftp-area"
 	@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 "
+	@echo "               asir-book, copy-asir-book-to-ftp-area "
 
 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 
+	-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 .OpenXM-win.tgz.copy.done
 
 clean-work:
 	-rm -rf work
@@ -102,6 +102,8 @@ win-correction1: build-bat copy-cygwin-dlls
 	-mkdir OpenXM-win/bin-windows
 #	(cd OpenXM-win/rc ; make clean ; make)
 win-correction2: win-correction1
+	cp oxasir-win.rr OpenXM-win/lib/sm1
+win-correction2_old:
 	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
@@ -131,6 +133,13 @@ build-tgz: win-correction-clean
 
 copy-to-orange: build-tgz
 	scp OpenXM-win.tgz taka@orange:tmp3
+copy-to-ftp-area: build-tgz
+	if [ ! -f .OpenXM-win.tgz.copy.done ]; then \
+	  scp OpenXM-win.tgz taka@orange:/export/home01/ftp/pub/OpenXM/Head/OpenXM-win-${ASIR_LANG}.tgz ; \
+	fi
+	touch .OpenXM-win.tgz.copy.done
+copy-to-ftp-area-stable: build-tgz
+	  scp OpenXM-win.tgz taka@orange:/export/home01/ftp/pub/OpenXM/${VERSION}/OpenXM-win-${ASIR_LANG}.tgz 
 
 link-for-debug:
 	(cd ${OpenXM_TOP} ; cd bin ; ln -s ../../OpenXM_contrib2/asir2000/asir .)
@@ -172,7 +181,7 @@ gen-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
+	-rm -rf asir-book .copy-to-asir-book-asir-bin .copy-to-asir-book-prog .copy-to-asir-book-meadow asir-book-en.tgz asir-book-ja.tgz
 
 mkdir-asir-book: 
 	-(mkdir asir-book)
@@ -180,31 +189,46 @@ mkdir-asir-book: 
 	-(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:  copy-to-asir-book-asir-bin copy-to-asir-book-prog copy-to-asir-book-meadow asir-book/readme-ja.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) ;\
+	-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 \
+	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
+MEADOW=Meadow-1.14-i386-base.tar.gz
 WGET_MEADOW=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/${MEADOW}
+WINTAR=tar.exe
+WGET_WINTAR=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/${WINTAR}
+WINGZIP=gzip.exe
+WGET_WINGZIP=--passive-ftp ftp://ftp:${USER}.openxm.org@ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/1.2.2/${WINGZIP}
 copy-to-asir-book-meadow:
-	if [ ! -f .copy-to-asir-book-meadow ] ; then \
-	 if [ ! -f work/${MEADOW} ] ; then \
+	if [ ! -f .copy-to-asir-book-meadow ]; then \
+	 if [ ! -f work/${MEADOW} ]; then \
 		(cd work ; wget ${WGET_MEADOW} ) ; \
+		(cd work ; wget ${WGET_WINTAR} ) ; \
+		(cd work ; wget ${WGET_WINGZIP} ) ; \
 	 fi ; \
-	 (cd asir-book ; cp ../work/${MEADOW} asir-book/Meadow) ; \
+	 (cd asir-book ; cp ../work/${MEADOW} Meadow) ; \
+	 (cd asir-book ; cp ../work/${WINTAR} Meadow) ; \
+	 (cd asir-book ; cp ../work/${WINGZIP} 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
+asir-book/readme-ja.html: Readme-CD/asir-book-index.html
+	cp Readme-CD/asir-book-index.html asir-book/readme-ja.html
+
+copy-asir-book-to-ftp-area: asir-book-${ASIR_LANG}.tgz
+	scp asir-book-${ASIR_LANG}.tgz taka@orange:/export/home01/ftp/pub/OpenXM/asir-book
+asir-book-${ASIR_LANG}.tgz: asir-book 
+	tar czvf asir-book-${ASIR_LANG}.tgz --exclude Meadow asir-book
+
+