remove jcat

2 files changed, 56 insertions, 134 deletions

diff --git a/core/makefile b/core/makefile
index dbfea8011..2a66050bf 100755
--- a/core/makefile
+++ b/core/makefile
@@ -257,6 +257,22 @@ ${shell echo $(1) | sed "s/\(.*\)/\U\1/g"}
 endef
 endif
 
+# config base
+ifeq ($(HOST),mac)
+base_LIBPATH 	:= /usr/local/lib
+base_LIBNAMES 	:= m dl pthread
+endif
+
+ifeq ($(HOST),msvc)
+base_LIBPATH 	:= 
+base_LIBNAMES 	:= ws2_32
+endif
+
+ifeq ($(HOST),linux)
+base_LIBPATH 	:= 
+base_LIBNAMES 	:= rt m dl pthread
+endif
+
 # select package directory
 ifneq ($(PACKAGE),)
 PKG_DIR 	:= $(PACKAGE)
@@ -270,14 +286,7 @@ $(foreach name, $(PKG_NAMES), $(eval $(call MAKE_UPPER_PACKAGE_NAME,$(name))))
 
 # probe packages
 define PROBE_PACKAGE
-$($(1)_upper) :=$(if $($($(1)_upper)),$($($(1)_upper)),\
-				$(shell if [ -d "$(PKG_DIR)/$(1).pkg/lib/$(PLAT)/$(ARCH)" ]; then \
-					echo "y"; \
-				elif [ -z "`$(TOOL_DIR)/jcat/jcat --filter=.compiler.$(PLAT).$(ARCH).$(if $(findstring y,$(DEBUG)),debug,release) $(PKG_DIR)/$(1).pkg/manifest.json`" ]; then \
-					echo "n"; \
-				else \
-					echo "y"; \
-				fi ))
+$($(1)_upper) :=y
 endef
 $(foreach name, $(PKG_NAMES), $(eval $(call PROBE_PACKAGE,$(name))))
 
@@ -289,26 +298,6 @@ define MAKE_PACKAGE_INFO_
 $(if $(findstring y,$($(1))),__autoconf_head_$(PRO_PREFIX)CONFIG_PACKAGE_HAVE_$(1)_autoconf_tail__,)
 endef
 
-# load package options
-define LOAD_PACKAGE_OPTIONS
-$(if $(findstring y,$($($(1)_upper))),\
-	"$($(1)_upper) ="$($($(1)_upper))"\n" \
-	"$(1)_INCPATH ="$(shell echo `$(TOOL_DIR)/jcat/jcat --filter=.compiler.$(PLAT).$(ARCH).$(if $(findstring y,$(DEBUG)),debug,release).incpath $(PKG_DIR)/$(1).pkg/manifest.json` )"\n" \
-	"$(1)_LIBPATH ="$(shell echo `$(TOOL_DIR)/jcat/jcat --filter=.compiler.$(PLAT).$(ARCH).$(if $(findstring y,$(DEBUG)),debug,release).libpath $(PKG_DIR)/$(1).pkg/manifest.json` )"\n" \
-	"$(1)_INCFLAGS ="$(shell echo `$(TOOL_DIR)/jcat/jcat --filter=.compiler.$(PLAT).$(ARCH).$(if $(findstring y,$(DEBUG)),debug,release).incflags $(PKG_DIR)/$(1).pkg/manifest.json` )"\n" \
-	"$(1)_LIBFLAGS ="$(shell echo `$(TOOL_DIR)/jcat/jcat --filter=.compiler.$(PLAT).$(ARCH).$(if $(findstring y,$(DEBUG)),debug,release).libflags $(PKG_DIR)/$(1).pkg/manifest.json` )"\n" \
-	"$(1)_LIBNAMES ="$(shell if [ -f $(PKG_DIR)/$(1).pkg/manifest.json ]; then echo `$(TOOL_DIR)/jcat/jcat --filter=.compiler.$(PLAT).$(ARCH).$(if $(findstring y,$(DEBUG)),debug,release).libs $(PKG_DIR)/$(1).pkg/manifest.json`; else echo $(1)$(DTYPE); fi)"\n" \
-	"export "$($(1)_upper)"\n" \
-	"export "$(1)_INCPATH"\n" \
-	"export "$(1)_LIBPATH"\n" \
-	"export "$(1)_LIBNAMES"\n" \
-	"export "$(1)_INCFLAGS"\n" \
-	"export "$(1)_LIBFLAGS"\n\n" \
-,\
-	"$($(1)_upper) ="$($($(1)_upper))"\n" \
-	"export "$($(1)_upper)"\n\n")
-endef
-
 # config
 config : .null
 	-@cp $(PRO_DIR)/plat/$(PLAT)/config.h $(PRO_DIR)/$(PRO_NAME).config.h
@@ -452,7 +441,45 @@ config : .null
 	@$(ECHO) "PKG_DIR ="$(PKG_DIR)						>> .config.mak
 	@$(ECHO) "export PACKAGE"							>> .config.mak
 	@$(ECHO) "export PKG_DIR"							>> .config.mak
-	@$(ECHO) $(foreach name, $(PKG_NAMES), $(call LOAD_PACKAGE_OPTIONS,$(name))) >> .config.mak
+	@$(ECHO) ""											>> .config.mak
+	@$(ECHO) "TBOX =y"									>> .config.mak
+	@$(ECHO) "tbox_INCPATH ="							>> .config.mak
+	@$(ECHO) "tbox_LIBPATH ="							>> .config.mak
+	@$(ECHO) "tbox_INCFLAGS ="							>> .config.mak
+	@$(ECHO) "tbox_LIBFLAGS ="							>> .config.mak
+	@$(ECHO) "tbox_LIBNAMES =tboxr"						>> .config.mak
+	@$(ECHO) "export TBOX"								>> .config.mak
+	@$(ECHO) "export tbox_INCPATH"						>> .config.mak
+	@$(ECHO) "export tbox_LIBPATH"						>> .config.mak
+	@$(ECHO) "export tbox_LIBNAMES"						>> .config.mak
+	@$(ECHO) "export tbox_INCFLAGS"						>> .config.mak
+	@$(ECHO) "export tbox_LIBFLAGS"						>> .config.mak
+	@$(ECHO) ""											>> .config.mak
+	@$(ECHO) "LUAJIT =y"								>> .config.mak
+	@$(ECHO) "luajit_INCPATH ="							>> .config.mak
+	@$(ECHO) "luajit_LIBPATH ="							>> .config.mak
+	@$(ECHO) "luajit_INCFLAGS ="						>> .config.mak
+	@$(ECHO) "luajit_LIBFLAGS ="						>> .config.mak
+	@$(ECHO) "luajit_LIBNAMES =luajit"					>> .config.mak
+	@$(ECHO) "export LUAJIT"							>> .config.mak
+	@$(ECHO) "export luajit_INCPATH"					>> .config.mak
+	@$(ECHO) "export luajit_LIBPATH"					>> .config.mak
+	@$(ECHO) "export luajit_LIBNAMES"					>> .config.mak
+	@$(ECHO) "export luajit_INCFLAGS"					>> .config.mak
+	@$(ECHO) "export luajit_LIBFLAGS"					>> .config.mak
+	@$(ECHO) ""											>> .config.mak
+	@$(ECHO) "BASE =y"									>> .config.mak
+	@$(ECHO) "base_INCPATH ="							>> .config.mak
+	@$(ECHO) "base_LIBPATH =$(base_LIBPATH)" 			>> .config.mak
+	@$(ECHO) "base_INCFLAGS ="							>> .config.mak
+	@$(ECHO) "base_LIBFLAGS ="							>> .config.mak
+	@$(ECHO) "base_LIBNAMES =$(base_LIBNAMES)" 			>> .config.mak
+	@$(ECHO) "export BASE"								>> .config.mak
+	@$(ECHO) "export base_INCPATH"						>> .config.mak
+	@$(ECHO) "export base_LIBPATH"						>> .config.mak
+	@$(ECHO) "export base_LIBNAMES"						>> .config.mak
+	@$(ECHO) "export base_INCFLAGS"						>> .config.mak
+	@$(ECHO) "export base_LIBFLAGS"						>> .config.mak
 
 # ######################################################################################
 # help
diff --git a/core/pkg/base.pkg/manifest.json b/core/pkg/base.pkg/manifest.json
deleted file mode 100755
index 6021e291d..000000000
--- a/core/pkg/base.pkg/manifest.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-    "format":
-    {
-        "name":         "The TBOOX Package Format"
-    ,   "version":      "v1.0.1"
-    ,   "website":      "http://www.tboox.org"
-    }
-
-,   "package":
-    {
-        "name":         "The Base Library"
-    }
-
-,   "compiler": 
-    {
-        "mac":
-        {
-            "x64":              
-            {
-                "debug":
-                {
-                    "libs":         "m dl pthread"
-                ,   "libpath":      "/usr/local/lib"
-                ,   "incpath":      ""
-                ,   "libflags":     ""
-                ,   "incflags":     ""
-                }
-            ,   "release":          "$.compiler.mac.x64.debug"
-            }
-        ,   "x86":              "$.compiler.mac.x64"
-        }
-
-    ,   "msvc":
-        {
-            "x86":
-            {
-                "debug":
-                {
-                    "libs":     "ws2_32"
-                }
-            ,   "release":      "$.compiler.msvc.x86.debug"
-            }
-        }
-
-    ,   "cygwin":
-        {
-            "x86":
-            {
-                "debug":
-                {
-                    "libs":     "ws2_32 m dl pthread"
-                }
-            ,   "release":      "$.compiler.cygwin.x86.debug"
-            }
-        }
-
-    ,   "mingw":                "$.compiler.msvc"
-
-    ,   "android":
-        {
-            "armv5te":
-            {
-                "debug":
-                {
-                    "libs":     "stdc++ log gcc c m dl"
-                }
-            ,   "release":      "$.compiler.android.armv5te.debug"
-            }
-
-        ,   "armv6":            "$.compiler.android.armv5te"
-        ,   "armv7":            "$.compiler.android.armv5te"
-        }
-
-    ,   "ios":
-        {
-            "armv6":
-            {
-                "debug":
-                {
-                    "libs":     "stdc++ m dl pthread"
-                ,   "libflags": "-framework UIKit"
-                }
-            ,   "release":      "$.compiler.ios.armv6.debug"
-            }
-
-        ,   "armv7":            "$.compiler.ios.armv6"
-        ,   "armv7s":           "$.compiler.ios.armv6"
-        ,   "arm64":            "$.compiler.ios.armv6"
-        }
-
-    ,   "linux":
-        {
-            "x86":
-            {
-                "debug":
-                {
-                    "libs":     "rt m dl pthread"
-                }
-            ,   "release":      "$.compiler.linux.x86.debug"
-            }
-
-        ,   "x64":              "$.compiler.linux.x86"
-        }
-    }
-}