=================================================================== RCS file: /home/cvs/OpenXM/misc/packages/Windows/Makefile,v retrieving revision 1.30 retrieving revision 1.42 diff -u -p -r1.30 -r1.42 --- OpenXM/misc/packages/Windows/Makefile 2002/09/30 23:32:13 1.30 +++ OpenXM/misc/packages/Windows/Makefile 2005/10/15 06:25:30 1.42 @@ -1,8 +1,8 @@ -# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.29 2002/09/30 13:10:05 takayama Exp $ +# $OpenXM: OpenXM/misc/packages/Windows/Makefile,v 1.41 2005/07/19 10:27:11 takayama Exp $ OpenXM_TOP=../../../../OpenXM ASIR_LANG=ja #ASIR_LANG=en -VERSION=1.2.2 +VERSION=1.2.3 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 @@ -14,7 +14,7 @@ usage: @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: @@ -29,7 +29,7 @@ all: copy-binary-phc copy-binary copy-binary-asir win- build-binary-openxm-cygwin: if [ ! -f .build-binary-openxm-cygwin-done ] ; then \ - (cd ${OpenXM_TOP}/src ; make install-kan-ox ; make install-phc) ; \ + (cd ${OpenXM_TOP}/src ; make install-asir-contrib ) ; \ touch .build-binary-openxm-cygwin-done ; \ fi @@ -44,7 +44,9 @@ copy-binary-openxm-cygwin: build-binary-openxm-cygwin 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 ; \ + rsync -avz --delete --exclude CVS ../${OpenXM_TOP}/libexec . ; \ find . -name 'CVS' -print | xargs rm -rf ; \ + find . -name 'DO_NOT_EDIT*' -print | xargs rm -rf ; \ ) ; \ cp Readme-CD/readme-ja.html OpenXM-win ; \ cp Readme-CD/readme-en.html OpenXM-win ; \ @@ -76,7 +78,7 @@ copy-binary-asir-from-local-disk: fi copy-binary-phc: - if [ ! -f .copy-binary-phc-done ] ; then \ + -if [ ! -f .copy-binary-phc-done ] ; then \ make copy-binary-phc-from-internet ; \ fi @@ -102,6 +104,9 @@ 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 + cp oxasir-win.rr $(OpenXM_TOP)/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 @@ -133,7 +138,7 @@ 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 ; \ + scp OpenXM-win.tgz taka@orange2:/home/ftp/pub/OpenXM/Head/OpenXM-win-${ASIR_LANG}.tgz ; \ fi touch .OpenXM-win.tgz.copy.done copy-to-ftp-area-stable: build-tgz @@ -156,15 +161,17 @@ debug-tools/crlf : debug-tools/crlf.c (cd debug-tools; gcc -o crlf crlf.c) 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 +debug-tools/gcwd : debug-tools/gcwd.c + (cd debug-tools; gcc -o gcwd gcwd.c) +build-bat: debug-tools/crlf debug-tools/debug-sed debug-tools/gcwd -mkdir OpenXM-win/bin-windows (cd debug-tools; sed -f dist.sed ../OpenXM-win/bin-windows/asirgui-cd.bat ; ./crlf ../OpenXM-win/bin-windows/asirgui-cd.bat) + (cd debug-tools; sed -f dist.sed ../OpenXM-win/bin-windows/sm1-cd.bat ; ./crlf ../OpenXM-win/bin-windows/sm1-cd.bat) (cd debug-tools; sed -f dist.sed ../OpenXM-win/bin-windows/webasir.bat ; ./crlf ../OpenXM-win/bin-windows/webasir.bat) (cd debug-tools; sed -f dist.sed ../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-debug.bat ; ./crlf asirgui-debug.bat) + (cd debug-tools; cp gcwd.exe ../OpenXM-win/bin-windows) remove-experimental: -rm -f OpenXM-win/bin-windows/*web*.bat @@ -179,7 +186,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) @@ -187,7 +194,7 @@ 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 \ @@ -221,5 +228,12 @@ copy-to-asir-book-meadow: fi touch .copy-to-asir-book-meadow -asir-book/readme.html: Readme-CD/asir-book-index.html - cp Readme-CD/asir-book-index.html asir-book/readme.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 + +