updated installer. api cleanup in progress.

CHANGES

@@ -1,2 +1,4 @@
 20080417 version: ada-lua 0.1
 20080912 code: large API and type cleanup.
+20081207 code: updated installer.
+20081207 code: another API cleanup in progress.

Makefile

@@ -12,28 +12,28 @@ UNIT_TESTS/loadstring1 UNIT_TESTS/loadstring1.ali UNIT_TESTS/loadstring1.o \
 UNIT_TESTS/loadstring2 UNIT_TESTS/loadstring2.ali UNIT_TESTS/loadstring2.o \
 UNIT_TESTS/open UNIT_TESTS/open.ali UNIT_TESTS/open.o UNIT_TESTS/utest.ali \
 UNIT_TESTS/utest.o ctxt/bindir.o ctxt/ctxt.a ctxt/dlibdir.o ctxt/incdir.o \
-ctxt/repos.o ctxt/slibdir.o ctxt/version.o deinstaller deinstaller.o inst-check \
-inst-check.o inst-copy inst-copy.o inst-dir inst-dir.o inst-link inst-link.o \
-install_core.o install_error.o installer installer.o instchk instchk.o \
-insthier.o lua-ada-conf lua-ada-conf.o lua-ada.a lua-ext.o lua-lib.ali \
-lua-lib.o lua-udata.ali lua-udata.o lua.ali lua.o
+ctxt/repos.o ctxt/slibdir.o ctxt/version.o deinstaller deinstaller.o \
+install-core.o install-error.o install-posix.o install-win32.o install.a \
+installer installer.o instchk instchk.o insthier.o lua-ada-conf lua-ada-conf.o \
+lua-ada.a lua-ext.o lua-lib.ali lua-lib.o lua-udata.ali lua-udata.o lua.ali \
+lua.o
 
 # Mkf-deinstall
-deinstall: deinstaller inst-check inst-copy inst-dir inst-link
+deinstall: deinstaller conf-sosuffix
 	./deinstaller
-deinstall-dryrun: deinstaller inst-check inst-copy inst-dir inst-link
+deinstall-dryrun: deinstaller conf-sosuffix
 	./deinstaller dryrun
 
 # Mkf-install
-install: installer inst-check inst-copy inst-dir inst-link postinstall
+install: installer postinstall conf-sosuffix
 	./installer
 	./postinstall
 
-install-dryrun: installer inst-check inst-copy inst-dir inst-link
+install-dryrun: installer conf-sosuffix
 	./installer dryrun
 
 # Mkf-instchk
-install-check: instchk inst-check
+install-check: instchk conf-sosuffix
 	./instchk
 
 # Mkf-test
@@ -292,70 +292,49 @@ cc-compile ctxt/version.c
 	./cc-compile ctxt/version.c
 
 deinstaller:\
-cc-link deinstaller.ld deinstaller.o insthier.o install_core.o install_error.o \
-ctxt/ctxt.a
-	./cc-link deinstaller deinstaller.o insthier.o install_core.o install_error.o \
-	ctxt/ctxt.a
+cc-link deinstaller.ld deinstaller.o insthier.o install.a ctxt/ctxt.a
+	./cc-link deinstaller deinstaller.o insthier.o install.a ctxt/ctxt.a
 
 deinstaller.o:\
 cc-compile deinstaller.c install.h
 	./cc-compile deinstaller.c
 
-inst-check:\
-cc-link inst-check.ld inst-check.o install_error.o
-	./cc-link inst-check inst-check.o install_error.o
+install-core.o:\
+cc-compile install-core.c install.h
+	./cc-compile install-core.c
 
-inst-check.o:\
-cc-compile inst-check.c install.h
-	./cc-compile inst-check.c
+install-error.o:\
+cc-compile install-error.c install.h
+	./cc-compile install-error.c
 
-inst-copy:\
-cc-link inst-copy.ld inst-copy.o install_error.o
-	./cc-link inst-copy inst-copy.o install_error.o
+install-posix.o:\
+cc-compile install-posix.c install.h
+	./cc-compile install-posix.c
 
-inst-copy.o:\
-cc-compile inst-copy.c install.h
-	./cc-compile inst-copy.c
+install-win32.o:\
+cc-compile install-win32.c install.h
+	./cc-compile install-win32.c
 
-inst-dir:\
-cc-link inst-dir.ld inst-dir.o install_error.o
-	./cc-link inst-dir inst-dir.o install_error.o
+install.a:\
+cc-slib install.sld install-core.o install-posix.o install-win32.o \
+install-error.o
+	./cc-slib install install-core.o install-posix.o install-win32.o \
+	install-error.o
 
-inst-dir.o:\
-cc-compile inst-dir.c install.h
-	./cc-compile inst-dir.c
-
-inst-link:\
-cc-link inst-link.ld inst-link.o install_error.o
-	./cc-link inst-link inst-link.o install_error.o
-
-inst-link.o:\
-cc-compile inst-link.c install.h
-	./cc-compile inst-link.c
-
-install_core.o:\
-cc-compile install_core.c install.h
-	./cc-compile install_core.c
-
-install_error.o:\
-cc-compile install_error.c install.h
-	./cc-compile install_error.c
+install.h:\
+install_os.h
 
 installer:\
-cc-link installer.ld installer.o insthier.o install_core.o install_error.o \
-ctxt/ctxt.a
-	./cc-link installer installer.o insthier.o install_core.o install_error.o \
-	ctxt/ctxt.a
+cc-link installer.ld installer.o insthier.o install.a ctxt/ctxt.a
+	./cc-link installer installer.o insthier.o install.a ctxt/ctxt.a
 
 installer.o:\
 cc-compile installer.c install.h
 	./cc-compile installer.c
 
 instchk:\
-cc-link instchk.ld instchk.o insthier.o install_core.o install_error.o \
-ctxt/ctxt.a
-	./cc-link instchk instchk.o insthier.o install_core.o install_error.o \
-	ctxt/ctxt.a
+cc-link instchk.ld instchk.o insthier.o install.a ctxt/ctxt.a
+	./cc-link instchk instchk.o insthier.o install.a ctxt/ctxt.a
 
 instchk.o:\
 cc-compile instchk.c install.h
@@ -422,13 +401,13 @@ mk-ldtype:\
 conf-ld conf-systype conf-cctype
 
 mk-mk-ctxt:\
-conf-cc
+conf-cc conf-ld
 
 mk-sosuffix:\
 conf-systype
 
 mk-systype:\
-conf-cc
+conf-cc conf-ld
 
 clean-all: sysdeps_clean tests_clean obj_clean ext_clean
 clean: obj_clean
@@ -444,10 +423,10 @@ obj_clean:
 	UNIT_TESTS/utest.o ctxt/bindir.c ctxt/bindir.o ctxt/ctxt.a ctxt/dlibdir.c \
 	ctxt/dlibdir.o ctxt/incdir.c ctxt/incdir.o ctxt/repos.c ctxt/repos.o \
 	ctxt/slibdir.c ctxt/slibdir.o ctxt/version.c ctxt/version.o deinstaller \
-	deinstaller.o inst-check inst-check.o inst-copy inst-copy.o inst-dir inst-dir.o \
-	inst-link inst-link.o install_core.o install_error.o installer installer.o \
-	instchk instchk.o insthier.o lua-ada-conf lua-ada-conf.o lua-ada.a lua-ext.o \
-	lua-lib.ali lua-lib.o lua-udata.ali lua-udata.o lua.ali lua.o
+	deinstaller.o install-core.o install-error.o install-posix.o install-win32.o \
+	install.a installer installer.o instchk instchk.o insthier.o lua-ada-conf \
+	lua-ada-conf.o lua-ada.a lua-ext.o lua-lib.ali lua-lib.o lua-udata.ali \
+	lua-udata.o lua.ali lua.o
 ext_clean:
 	rm -f conf-adatype conf-cctype conf-ldtype conf-sosuffix conf-systype mk-ctxt
 

Mkf-deinstall

@@ -1,4 +1,4 @@
-deinstall: deinstaller inst-check inst-copy inst-dir inst-link
+deinstall: deinstaller conf-sosuffix
 	./deinstaller
-deinstall-dryrun: deinstaller inst-check inst-copy inst-dir inst-link
+deinstall-dryrun: deinstaller conf-sosuffix
 	./deinstaller dryrun

Mkf-install

@@ -1,6 +1,6 @@
-install: installer inst-check inst-copy inst-dir inst-link postinstall
+install: installer postinstall conf-sosuffix
 	./installer
 	./postinstall
 
-install-dryrun: installer inst-check inst-copy inst-dir inst-link
+install-dryrun: installer conf-sosuffix
 	./installer dryrun

Mkf-instchk

@@ -1,2 +1,2 @@
-install-check: instchk inst-check
+install-check: instchk conf-sosuffix
 	./instchk

deinstaller.c

@@ -1,20 +1,58 @@
-/* $Rev$ */
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "install.h"
 
 const char progname[] = "deinstaller";
 
-int main(int argc, char *argv[])
+void
+cb_info (const char *str, void *data)
+{
+  fprintf (stderr, "%s\n", str);
+}
+
+void
+cb_warn (const char *str, void *data)
+{
+  fprintf (stderr, "%s: warning: %s\n", progname, str);
+}
+
+int
+main (int argc, char *argv[])
 {
   unsigned long i;
   unsigned int flag;
+  struct install_status_t status;
 
   argv = 0;
-  if (!check_tools()) return 112;
+
+  status = install_init ();
+  if (status.status != INSTALL_STATUS_OK) {
+    fprintf (stderr, "%s: fatal: init: %s - %s\n", progname,
+      status.message, install_error (errno));
+    exit (112);
+  }
+
+  install_callback_warn_set (cb_warn);
+  install_callback_info_set (cb_info);
 
   flag = (argc > 1) ? INSTALL_DRYRUN : 0;
   for (i = insthier_len - 1;; --i) {
-    deinstall(&insthier[i], flag);
+    status = deinstall (&insthier[i], flag);
+    switch (status.status) {
+      case INSTALL_STATUS_OK:
+        break;
+      case INSTALL_STATUS_ERROR:
+        fprintf (stderr, "%s: error: %s - %s\n", progname,
+          status.message, install_error (errno));
+        break;
+      case INSTALL_STATUS_FATAL:
+        fprintf (stderr, "%s: fatal: %s - %s\n", progname,
+          status.message, install_error (errno));
+        exit (112);
+        break;
+    }
     if (i == 0) break;
   }
 

deinstaller.ld

@@ -1,5 +1,4 @@
 deinstaller.o
 insthier.o
-install_core.o
-install_error.o
+install.a
 ctxt/ctxt.a