===================================================================
RCS file: /home/cvs/OpenXM_contrib2/windows/Attic/makepkg.bat,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- OpenXM_contrib2/windows/Attic/makepkg.bat	2013/09/03 12:32:43	1.1
+++ OpenXM_contrib2/windows/Attic/makepkg.bat	2014/05/15 12:00:25	1.7
@@ -1,4 +1,4 @@
-@rem $OpenXM$
+@rem $OpenXM: OpenXM_contrib2/windows/makepkg.bat,v 1.6 2014/05/13 20:13:48 ohara Exp $
 @echo off
 
 if exist asir ( rmdir /q /s asir )
@@ -9,12 +9,18 @@ if /i "%Platform%" == "X64" (
   if not exist asir32gui\asirgui.exe ( call makebin32.bat )
 )
 
-mkdir asir\bin asir\help\ja asir\lib asir\lib-asir-contrib asir\share\editor 
+mkdir asir\bin asir\help\ja asir\lib\asir asir\lib\asir-contrib asir\share\editor
 
-for %%i in ( asir32gui\asirgui.exe asir32gui\ja.dll engine2000\engine.exe mcpp\cpp.exe post-msg-asirgui\cmdasir.exe ..\asir2000\asir.exe ) do (
+for %%i in ( asir32gui\asirgui.exe asir32gui\ja.dll engine2000\engine.exe mcpp\cpp.exe post-msg-asirgui\cmdasir.exe ..\asir2000\asir.exe curl.exe unzip.exe ) do (
   copy /b %%i asir\bin
 )
 
+if /i "%Platform%" == "X64" (
+  copy /b mpir\x64\mpir.dll asir\bin
+) else (
+  copy /b mpir\win32\mpir.dll asir\bin
+)
+
 pushd help
 if not exist ja ( call makehelp2.bat ja )
 if not exist en ( call makehelp2.bat en )
@@ -26,21 +32,30 @@ copy /b help\en\*.chm asir\help
 for %%i in ( asirgui.mac  asir-mode.el install-ja-sjis.txt ) do ( 
   copy /b post-msg-asirgui\%%i asir\share\editor
 )
-
-xcopy /q /s ..\asir2000\lib asir\lib
+copy /b ..\asir2000\LICENSE asir
+xcopy /q /s ..\asir2000\lib asir\lib\asir
 del /q asir\lib\Makefile*
 del /q asir\lib\help*.uu
 
-xcopy /q /s  ..\..\OpenXM\src\asir-contrib\packages\src asir\lib-asir-contrib
-copy /b ..\..\OpenXM\src\asir-contrib\testing\noro\ndbf.rr asir\lib-asir-contrib\nn_ndbf.rr
+xcopy /q /s  ..\..\OpenXM\src\asir-contrib\packages\src asir\lib\asir-contrib
+copy /b ..\..\OpenXM\src\asir-contrib\testing\noro\ndbf.rr asir\lib\asir-contrib\nn_ndbf.rr
 for %%i in ( de.rr gw.rr module_syz.rr mwl.rr pd.rr rewrite.rr ) do (
-  copy /b ..\..\OpenXM\src\asir-contrib\testing\noro\%%i asir\lib-asir-contrib\noro_%%i
+  copy /b ..\..\OpenXM\src\asir-contrib\testing\noro\%%i asir\lib\asir-contrib\noro_%%i
 )
+del /q asir\lib\asir-contrib\Makefile.in
+del /q asir\lib\asir-contrib\y_prime\.keepme
 
+for %%i in ( doc-asir2000.zip doc-asir-contrib.zip doc-other-docs.zip ) do (
+  if not exist ..\..\OpenXM_dist\%%i (
+    curl http://www.math.kobe-u.ac.jp/OpenXM/Current/archive-01/%%i -o ..\..\OpenXM_dist\%%i
+  )
+  unzip ..\..\OpenXM_dist\%%i -d asir
+)
+
 if /i "%Platform%" == "X64" (
-  zip -r asir_win64-%DATE:/=.%.zip asir
+  zip -r asir_win64_%DATE:/=.%.zip asir
 ) else (
-  zip -r asir_win32-%DATE:/=.%.zip asir
+  zip -r asir_win32_%DATE:/=.%.zip asir
 )
 
 exit /b 0