format

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@302 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Client/client.c b/Client/client.c
index b0bb6695db8b0b6ae5b529e05b3ed3ccdc648aca..8e01db016cbb707b75e3686af4fe725e1f573f84 100644 (file)
--- a/Client/client.c
+++ b/Client/client.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Grammar/dw.l b/Grammar/dw.l
index c34c73bd13d2d4f1b4eb610580ebccc750c540c5..51f960a58ea8418cf6370481aef601f0c16491fe 100644 (file)
--- a/Grammar/dw.l
+++ b/Grammar/dw.l
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Grammar/dw.y b/Grammar/dw.y
index 508c7d9bb5d9d3948411a0d16b66c8a64d81fde7..b75f5f8df571691473788416ecc6929f0e0a9a75 100644 (file)
--- a/Grammar/dw.y
+++ b/Grammar/dw.y
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Installer/Makefile b/Installer/Makefile
new file mode 100644 (file)
index 0000000..f023ecc
--- /dev/null
+++ b/Installer/Makefile
@@ -0,0 +1,20 @@
+# $Id$
+
+.PHONY: all clean
+.SUFFIXES: .c .o
+
+OBJS = install.o
+
+all: install$(EXEC_SUFFIX)
+
+install$(EXEC_SUFFIX): indep.h $(OBJS)
+       $(CC) $(LDFLAGS) $(PC98) -o $@ $(OBJS)
+
+indep.h: indep-$(INDEP).h
+       iconv -f utf-8 -t $(INDEP_TO) < indep-$(INDEP).h > $@
+
+.c.o:
+       $(CC) $(CFLAGS) $(PC98) -c -o $@ $<
+
+clean:
+       rm -f *.o install *.exe *.com *.res indep.h

diff --git a/Installer/indep-base.h b/Installer/indep-base.h
new file mode 100644 (file)
index 0000000..080ab1d
--- /dev/null
+++ b/Installer/indep-base.h
@@ -0,0 +1,32 @@
+/* $Id$ */
+/* --- START LICENSE --- */
+/* -------------------------------------------------------------------------- */
+/*                                                   DataWorks - Simple DBMS  */
+/* -------------------------------------------------------------------------- */
+/* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
+/* Redistribution and use in source and binary forms, with or without modific */
+/* ation, are permitted provided that the following conditions are met:       */
+/*     1. Redistributions of source code must retain the above copyright noti */
+/* ce, this list of conditions and the following disclaimer.                  */
+/*     2. Redistributions in binary form must reproduce the above copyright n */
+/* otice, this list of conditions and the following disclaimer in the documen */
+/* tation and/or other materials provided with the distribution.              */
+/*     3. Neither the name of the copyright holder nor the names of its contr */
+/* ibutors may be used to endorse or promote products derived from this softw */
+/* are without specific prior written permission.                             */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS */
+/* " AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, TH */
+/* E IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO */
+/* SE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS  */
+/* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CON */
+/* SEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITU */
+/* TE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPT */
+/* ION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S */
+/* TRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN AN */
+/* Y WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY  */
+/* OF SUCH DAMAGE.                                                            */
+/* -------------------------------------------------------------------------- */
+/* --- END LICENSE --- */
+
+#define INSTALLER_TITLE "Installer for DataWorks\n"

diff --git a/Installer/indep-jp.h b/Installer/indep-jp.h
new file mode 100644 (file)
index 0000000..132712c
--- /dev/null
+++ b/Installer/indep-jp.h
@@ -0,0 +1,32 @@
+/* $Id$ */
+/* --- START LICENSE --- */
+/* -------------------------------------------------------------------------- */
+/*                                                   DataWorks - Simple DBMS  */
+/* -------------------------------------------------------------------------- */
+/* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
+/* Redistribution and use in source and binary forms, with or without modific */
+/* ation, are permitted provided that the following conditions are met:       */
+/*     1. Redistributions of source code must retain the above copyright noti */
+/* ce, this list of conditions and the following disclaimer.                  */
+/*     2. Redistributions in binary form must reproduce the above copyright n */
+/* otice, this list of conditions and the following disclaimer in the documen */
+/* tation and/or other materials provided with the distribution.              */
+/*     3. Neither the name of the copyright holder nor the names of its contr */
+/* ibutors may be used to endorse or promote products derived from this softw */
+/* are without specific prior written permission.                             */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS */
+/* " AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, TH */
+/* E IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO */
+/* SE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS  */
+/* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CON */
+/* SEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITU */
+/* TE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPT */
+/* ION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S */
+/* TRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN AN */
+/* Y WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY  */
+/* OF SUCH DAMAGE.                                                            */
+/* -------------------------------------------------------------------------- */
+/* --- END LICENSE --- */
+
+#define INSTALLER_TITLE "DataWorksインストーラー\n"

diff --git a/Installer/install.c b/Installer/install.c
new file mode 100644 (file)
index 0000000..70c7d9a
--- /dev/null
+++ b/Installer/install.c
@@ -0,0 +1,46 @@
+/* $Id$ */
+/* --- START LICENSE --- */
+/* -------------------------------------------------------------------------- */
+/*                                                   DataWorks - Simple DBMS  */
+/* -------------------------------------------------------------------------- */
+/* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
+/* Redistribution and use in source and binary forms, with or without modific */
+/* ation, are permitted provided that the following conditions are met:       */
+/*     1. Redistributions of source code must retain the above copyright noti */
+/* ce, this list of conditions and the following disclaimer.                  */
+/*     2. Redistributions in binary form must reproduce the above copyright n */
+/* otice, this list of conditions and the following disclaimer in the documen */
+/* tation and/or other materials provided with the distribution.              */
+/*     3. Neither the name of the copyright holder nor the names of its contr */
+/* ibutors may be used to endorse or promote products derived from this softw */
+/* are without specific prior written permission.                             */
+/* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS */
+/* " AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, TH */
+/* E IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPO */
+/* SE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS  */
+/* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CON */
+/* SEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITU */
+/* TE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPT */
+/* ION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S */
+/* TRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN AN */
+/* Y WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY  */
+/* OF SUCH DAMAGE.                                                            */
+/* -------------------------------------------------------------------------- */
+/* --- END LICENSE --- */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "indep.h"
+
+const char copyr1[] = "Copyright (C) Crabware, pnsk-lab 2024";
+
+int main() {
+       printf("\x1b[2J\x1b[1;1H");
+       fflush(stdout);
+       printf(INSTALLER_TITLE);
+       int i;
+       for(i = 0; i < 80; i++) printf("-");
+       printf("\x1b[2;%dH %s -\n", 80 - strlen(copyr1) - 2, copyr1);
+}

diff --git a/Library/database.c b/Library/database.c
index 3f6a24c107a18ec660727ebf09423d9b68c9b48b..83f26c2ad51944682fafc6957b7621a1a8322543 100644 (file)
--- a/Library/database.c
+++ b/Library/database.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/database_db.c b/Library/database_db.c
index bf588a64e5899f321c868f16fcc199d753a1a329..6f008b3504371e0d79577bf9afa3f2f5458b2d22 100644 (file)
--- a/Library/database_db.c
+++ b/Library/database_db.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/database_record.c b/Library/database_record.c
index be89ba07248e82a53dfe72678ab5870010e141e4..22efac4a7ed7db4b4cccffe45173e70d03dce42c 100644 (file)
--- a/Library/database_record.c
+++ b/Library/database_record.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/database_table.c b/Library/database_table.c
index 8288d42f5c6f96ecd262138ece5be86e27b25b86..6537d8c841cec9b4b8778fd1d8d0f959eb262bfb 100644 (file)
--- a/Library/database_table.c
+++ b/Library/database_table.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dataworks.c b/Library/dataworks.c
index 8e4eb0a9a6801afc169f096fd703219e683c4a0e..d6e3b2dcf825b864b9ae4ec7db33b6d3c8e5e44e 100644 (file)
--- a/Library/dataworks.c
+++ b/Library/dataworks.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dataworks.h b/Library/dataworks.h
index b684303b86b9ecc5471b9858efdfd152ee732c14..e16ab52f2b9589976c97cad292d76c9b177fb9c4 100644 (file)
--- a/Library/dataworks.h
+++ b/Library/dataworks.h
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dw_database.h b/Library/dw_database.h
index 66b1ced9ea7ed5597b4c43c37acbc3970e0c85d9..3f58c85068da09fe874f872f283e2bf48394004c 100644 (file)
--- a/Library/dw_database.h
+++ b/Library/dw_database.h
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dw_parser.h b/Library/dw_parser.h
index cbf0f5c01acc0e22bfcc4039aca2063e6b6697a0..462137dae07882eff10a381c67957c3f1ca06e42 100644 (file)
--- a/Library/dw_parser.h
+++ b/Library/dw_parser.h
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/dw_util.h b/Library/dw_util.h
index 6ae6c5db7c2f05273aece125ffde994f2dc9b5ed..5b96ff6d5d5cc825646255b2057ac218ec3eb174 100644 (file)
--- a/Library/dw_util.h
+++ b/Library/dw_util.h
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/exec.c b/Library/exec.c
index 0d3d58af6d2db16a385eaee535f438f3ead7a6a6..5b00a12ab0968a7e350785b8fd286b9010dd0abc 100644 (file)
--- a/Library/exec.c
+++ b/Library/exec.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/parser.c b/Library/parser.c
index d8b018e56395c462d842ac398d70f69167ea1c3b..8d5a963cd6e11404a9f7c34a66284a86be656a15 100644 (file)
--- a/Library/parser.c
+++ b/Library/parser.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Library/util.c b/Library/util.c
index 14d3fba6b9fa930beda08058318f3e1c4878487b..9fa4abf8a1a181f3de0944d30d224f9a1b1305da 100644 (file)
--- a/Library/util.c
+++ b/Library/util.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Makefiles/Platforms/dos.mk b/Makefiles/Platforms/dos.mk
index e605dd5bf3ff5a2a9bd314940a260792e4410679..ea37bcc9458277888be5afbbfdd9c460014f6f6d 100644 (file)
--- a/Makefiles/Platforms/dos.mk
+++ b/Makefiles/Platforms/dos.mk
@@ -8,3 +8,4 @@ CFLAGS += -march=i86 -mstack-size=$(STACK_SIZE)
 LDFLAGS += -march=i86 -mstack-size=$(STACK_SIZE)
 SERVER_MODULE = hayes.o
 RCLI_MODULE = hayes.o
+INSTALLER = ./Installer

diff --git a/Makefiles/common-decl.mk b/Makefiles/common-decl.mk
index 933fc48d519798d28082519ccbe85f1e8d9c144c..f1429674a5145610c374f62b745a2c591b0813b9 100644 (file)
--- a/Makefiles/common-decl.mk
+++ b/Makefiles/common-decl.mk
@@ -21,10 +21,14 @@ EXEC_SUFFIX =
 PLATFORM_M = `uname -m`
 PLATFORM_P = `uname -p | sed -E "s/[ \\(\\)]/-/g"`
 LINK_LIB = ../Library/$(STATICLIB_PREFIX)dataworks$(STATICLIB_SUFFIX)
+INDEP = base
+INDEP_TO = utf-8
+PC98 =
 SERVER = ./Server
 RCLI = ./RemoteClient
+INSTALLER =
 SERVER_MODULE = tcpip.o
 RCLI_MODULE = tcpip.o
 VERSION = `cat Library/dataworks.c | grep " dataworks_version " | grep -Eo '[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9]+)?'`
 
-COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIB="$(LINK_LIB)" AR_ARGS="$(AR_ARGS)" WINDRES="$(WINDRES)" YACC="$(YACC)" LEX="$(LEX)" LFLAGS="$(LFLAGS)" YFLAGS="$(YFLAGS)" SERVER_MODULE="$(SERVER_MODULE)" SERVLINK_LIB="$(SERVLINK_LIB)" RCLI_MODULE="$(RCLI_MODULE)" RCLILINK_LIB="$(RCLILINK_LIB)"
+COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIB="$(LINK_LIB)" AR_ARGS="$(AR_ARGS)" WINDRES="$(WINDRES)" YACC="$(YACC)" LEX="$(LEX)" LFLAGS="$(LFLAGS)" YFLAGS="$(YFLAGS)" SERVER_MODULE="$(SERVER_MODULE)" SERVLINK_LIB="$(SERVLINK_LIB)" RCLI_MODULE="$(RCLI_MODULE)" RCLILINK_LIB="$(RCLILINK_LIB)" INDEP="$(INDEP)" INDEP_TO="$(INDEP_TO)"

diff --git a/Makefiles/common.mk b/Makefiles/common.mk
index b19aba0b78d1f5b5d6762fee73a00781fcf05e38..124d5fb40d7bb36941f1289c79c8064f0ab66878 100644 (file)
--- a/Makefiles/common.mk
+++ b/Makefiles/common.mk
@@ -1,11 +1,11 @@
 # $Id$
 
-.PHONY: all no-doc replace format clean ./Library ./Client ./Document ./Grammar ./RemoteClient ./Package/PKGBUILD archive archive-prepare archive-cleanup archive-targz archive-zip dosbox prepare-dosbox dosbox-x cleanup-dosbox get-version thanks-banner
+.PHONY: all no-doc replace format clean ./Library ./Client ./Document ./Server ./Grammar ./RemoteClient ./Installer ./Package/PKGBUILD archive archive-prepare archive-cleanup archive-targz archive-zip dosbox prepare-dosbox dosbox-x cleanup-dosbox get-version thanks-banner dos-installer
 
-all: ./Grammar ./Library ./Client $(SERVER) $(RCLI) ./Document
+all: ./Grammar ./Library ./Client $(SERVER) $(RCLI) $(INSTALLER) ./Document
        @$(MAKE) thanks-banner
 
-no-doc: ./Grammar ./Library ./Client $(SERVER) $(RCLI)
+no-doc: ./Grammar ./Library ./Client $(SERVER) $(RCLI) $(INSTALLER)
        @$(MAKE) thanks-banner
 
 thanks-banner:
@@ -17,22 +17,25 @@ thanks-banner:
        @echo "+-----------------------------------------+"
 
 ./Grammar::
-       $(MAKE) -C $@ $(COMPILE_FLAGS)
+       $(MAKE) -C $@ $(COMPILE_FLAGS) $(TARGET)
 
 ./Library:: ./Grammar
-       $(MAKE) -C $@ $(COMPILE_FLAGS)
+       $(MAKE) -C $@ $(COMPILE_FLAGS) $(TARGET)
 
 ./Client:: ./Library
-       $(MAKE) -C $@ $(COMPILE_FLAGS)
+       $(MAKE) -C $@ $(COMPILE_FLAGS) $(TARGET)
 
 ./Server:: ./Library
-       $(MAKE) -C $@ $(COMPILE_FLAGS)
+       $(MAKE) -C $@ $(COMPILE_FLAGS) $(TARGET)
 
 ./RemoteClient:: ./Library
-       $(MAKE) -C $@ $(COMPILE_FLAGS)
+       $(MAKE) -C $@ $(COMPILE_FLAGS) $(TARGET)
+
+./Installer:: ./Library
+       $(MAKE) -C $@ $(COMPILE_FLAGS) $(TARGET)
 
 ./Document::
-       $(MAKE) -C ./Document $(COMPILE_FLAGS)
+       $(MAKE) -C $@ $(COMPILE_FLAGS) $(TARGET)
 
 FILES = `find . -name "*.c" -or -name "*.h"`
 
@@ -53,8 +56,47 @@ clean:
        $(MAKE) -C ./Client clean $(COMPILE_FLAGS)
        $(MAKE) -C ./Server clean $(COMPILE_FLAGS)
        $(MAKE) -C ./RemoteClient clean $(COMPILE_FLAGS)
+       $(MAKE) -C ./Installer clean $(COMPILE_FLAGS)
        $(MAKE) -C ./Document clean $(COMPILE_FLAGS)
 
+dos-installer:
+       if [ ! "$(FORMAT)" = "NO" ]; then $(MAKE) clean ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then $(MAKE) PLATFORM=dos no-doc ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then rm -f install.img ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then mformat -C -f 1440 -v DWINST -i install.img :: ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then mcopy -i install.img Client/*.exe ::dw.exe ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then mcopy -i install.img Server/*.exe ::dwserv.exe ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then mcopy -i install.img RemoteClient/*.exe ::dwrcli.exe ; fi
+       $(MAKE) PLATFORM=dos TARGET=clean ./Installer
+       $(MAKE) PLATFORM=dos ./Installer
+       mcopy -oi install.img Installer/*.exe ::install.exe
+       $(MAKE) PLATFORM=dos TARGET=clean ./Installer
+       $(MAKE) PLATFORM=dos PC98="-DPC98 -zk0" INDEP=jp INDEP_TO=cp932 ./Installer
+       mcopy -oi install.img Installer/*.exe ::insta98.exe
+       if [ ! -e lha.exe ]; then wget http://f.nishi.boats/f/g/lha.exe ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then mcopy -i install.img lha.exe ::lha.exe ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then mkdir -p install-workdir ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "[cpu]" > install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "cycles=30000" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "[autoexec]" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "imgmount -t floppy a: ./install.img" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "a:" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "mount c: ./install-workdir" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "lha a C:\EXTRACT.LZH dw.exe dwserv.exe dwrcli.exe" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "del dw.exe" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "del dwserv.exe" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "del dwrcli.exe" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "c:" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "a:\lha s extract.lzh" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "a:" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "copy C:\EXTRACT.EXE" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "del lha.exe" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then echo "exit" >> install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then dosbox -conf install-dosbox.conf ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then rm -rf install-workdir ; fi
+       if [ ! "$(FORMAT)" = "NO" ]; then rm -f install-dosbox.conf ; fi
+       $(MAKE) clean
+
 archive-prepare: all
        rm -f dataworks.zip dataworks.tar.gz
        rm -rf dataworks-dist

diff --git a/README.md b/README.md
index a0e147853abb482b5e73e733a73a65d43a816908..c414225ebf537d529c3f9c2436f7bb4f563f5b7f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -55,6 +55,9 @@ Original: http://sw.nishi.boats/svn/nishi-dataworks
  - `Grammar`
  
        Contains Yacc/Flex files
+ - `Installer`
+ 
+       Contains DOS installer source code
  - `Library`
  
        Contains base library source code

diff --git a/RemoteClient/hayes.c b/RemoteClient/hayes.c
index 540839f6a6f4e8dac4dc8d10623aa6d7cbcf8dad..6e873f270b293ec1fc2a93156ffea25bc62f539c 100644 (file)
--- a/RemoteClient/hayes.c
+++ b/RemoteClient/hayes.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/RemoteClient/rcli.c b/RemoteClient/rcli.c
index ea6b60111d818cec78354161225bfe69a6f39adc..cdb1280426e41e809e20b34db5ad515db79d4b71 100644 (file)
--- a/RemoteClient/rcli.c
+++ b/RemoteClient/rcli.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/RemoteClient/tcpip.c b/RemoteClient/tcpip.c
index d118181c868e0f281ee5326069ddc81800368b4f..fda57882997a95454818a142f3c2063b9ca308d4 100644 (file)
--- a/RemoteClient/tcpip.c
+++ b/RemoteClient/tcpip.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Server/hayes.c b/Server/hayes.c
index 62c6b8037d1643b8e350ccb5643c0c18fe10ecde..4337a60cf2fba5d772db48d4031c4b1181142535 100644 (file)
--- a/Server/hayes.c
+++ b/Server/hayes.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Server/server.c b/Server/server.c
index ab621f7fa2e055f2a34ba9ef144832ba53f51dd5..049b5241bf6a9522d02985198380fd4ca5298842 100644 (file)
--- a/Server/server.c
+++ b/Server/server.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */

diff --git a/Server/tcpip.c b/Server/tcpip.c
index ff25f9e31b7c7920f461807ae83aa6a4b6358707..d1b5fa90902407863b18c9a598609256355dcae4 100644 (file)
--- a/Server/tcpip.c
+++ b/Server/tcpip.c
@@ -4,6 +4,7 @@
 /*                                                   DataWorks - Simple DBMS  */
 /* -------------------------------------------------------------------------- */
 /* Copyright (c) 2024 Crabware.                                               */
+/* Copyright (c) 2024 pnsk-lab.                                               */
 /* Redistribution and use in source and binary forms, with or without modific */
 /* ation, are permitted provided that the following conditions are met:       */
 /*     1. Redistributions of source code must retain the above copyright noti */