fixed WEExtensions and WOExtensions for SOPE 3.3

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@16 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog
index 74ad4519e39420687583819621fea98350ca0636..dacaa0e95b9bf1b893d5f6b28912980b27f9c9f6 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * fixed for SOPE 3.3 directory layout (v4.3.55)
+
        * moved to SOPE 4.3 (v4.3.54)
 
 2004-08-15  Helge Hess  <helge.hess@skyrix.com>

diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble
index ffcb86573e19fa0cc9fe8c2e4981fd6d5f6b2de2..587001da84c401b449fe3f0d723e708bf7db008e 100644 (file)
--- a/sope-appserver/WEExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WEExtensions/GNUmakefile.preamble
@@ -1,4 +1,14 @@
-# $Id$
+# compiler flags
+
+
+ADDITIONAL_CPPFLAGS += -Wall
+ADDITIONAL_INCLUDE_DIRS += \
+       -I.. -I../.. -I../NGObjWeb      \
+       -I../../sope-core/NGStreams     \
+       -I../../sope-core/NGExtensions  \
+       -I../../sope-core               \
+       -I../../sope-xml
+
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
 after-WEExtensions-all ::
@@ -13,39 +23,39 @@ endif
 libWEExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 
 libWEExtensions_LIBRARIES_DEPEND_UPON += \
-       -lNGObjWeb -lNGJavaScript -lNGScripting \
+       -lNGObjWeb -lNGScripting \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC \
-       -ljs
-
-ADDITIONAL_CPPFLAGS += -Wall
-ADDITIONAL_INCLUDE_DIRS += -I.. -I../.. -I../NGObjWeb
+       -lXmlRpc -lDOM -lSaxObjC
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_JS=$(GNUSTEP_BUILD_DIR)/../../../ThirdParty/js-1.5
-RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../skyrix-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../skyrix-xml
+RELBUILD_DIR_APPSERVER=$(GNUSTEP_BUILD_DIR)/..
+RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime
+RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core
+RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
 ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
-        -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)                \
-        -L$(RELBUILD_DIR_SOPE)/NGJavaScript/$(GNUSTEP_OBJ_DIR_NAME)    \
-        -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)      \
-        -L$(RELBUILD_DIR_SxCore)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)        \
+        -L$(RELBUILD_DIR_APPSERVER)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)   \
+        -L$(RELBUILD_DIR_APPSERVER)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)        \
+        -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME)                 \
         -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
         -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
         -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)             \
         -L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)         \
         -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)            \
-        -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)                \
-       -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME)
+        -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 else
 ADDITIONAL_LIB_DIRS += \
-       -L./$(GNUSTEP_OBJ_DIR)                  \
-        -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)        \
-        -L../NGJavaScript/$(GNUSTEP_OBJ_DIR)    \
-        -L../NGScripting/$(GNUSTEP_OBJ_DIR)
+       -L./$(GNUSTEP_OBJ_DIR)                                  \
+        -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)                       \
+        -L../NGScripting/$(GNUSTEP_OBJ_DIR)                    \
+        -L../../sope-mime/$(GNUSTEP_OBJ_DIR)                   \
+        -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)         \
+        -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)      \
+        -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)         \
+        -L../../sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)             \
+        -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)                        \
+        -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
 WEExtensions_BUNDLE_LIBS   += -lWEExtensions

diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version
index 0b60037f9deb8300f4e1797e5027eecb0c5a2154..0f46daa27a5d7776702a7929c8c017151179dfcc 100644 (file)
--- a/sope-appserver/WEExtensions/Version
+++ b/sope-appserver/WEExtensions/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=54
+SUBMINOR_VERSION:=55

diff --git a/sope-appserver/WEExtensions/WETableView/GNUmakefile.preamble b/sope-appserver/WEExtensions/WETableView/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..42ce551
--- /dev/null
+++ b/sope-appserver/WEExtensions/WETableView/GNUmakefile.preamble
@@ -0,0 +1,9 @@
+# compiler flags
+
+ADDITIONAL_CPPFLAGS += -Wall
+ADDITIONAL_INCLUDE_DIRS += \
+       -I.. -I../.. -I../../NGObjWeb           \
+       -I../../../sope-core/NGStreams          \
+       -I../../../sope-core/NGExtensions       \
+       -I../../../sope-core                    \
+       -I../../../sope-xml

diff --git a/sope-appserver/WOExtensions/ChangeLog b/sope-appserver/WOExtensions/ChangeLog
index 22a4c03927a322b347889a1dae54bdf9b7a12a79..8a73cc2c2724508f1d48d16ba2221c319f5debb8 100644 (file)
--- a/sope-appserver/WOExtensions/ChangeLog
+++ b/sope-appserver/WOExtensions/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
+       * fixed for SOPE 3.3 directory layout (v4.3.16)
+
        * moved to SOPE 4.3 (v4.3.15)
 
 2004-06-10  Helge Hess  <helge.hess@opengroupware.org>

diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble
index 19f741bede7f42b1ac9c36e623c70ed37c54b50e..35a1893695c2c2c67bb68c2241e7a6558444cf2e 100644 (file)
--- a/sope-appserver/WOExtensions/GNUmakefile.preamble
+++ b/sope-appserver/WOExtensions/GNUmakefile.preamble
@@ -1,44 +1,56 @@
-# $Id$
+# compile flags
+
+
+ADDITIONAL_CPPFLAGS += -Wall
+ADDITIONAL_INCLUDE_DIRS += \
+       -I.. -I../..                    \
+       -I../NGObjWeb                   \
+       -I../../sope-core/NGStreams     \
+       -I../../sope-core/NGExtensions  \
+       -I../../sope-core               \
+       -I../../sope-xml
+
 
 libWOExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 
+
 libWOExtensions_LIBRARIES_DEPEND_UPON += \
        -lWEExtensions                                  \
-       -lNGObjWeb -lNGJavaScript -lNGScripting         \
+       -lNGObjWeb -lNGScripting                \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
-       -lXmlRpc -lDOM -lSaxObjC        \
-       -ljs
+       -lXmlRpc -lDOM -lSaxObjC
 
-ADDITIONAL_CPPFLAGS += -Wall
-ADDITIONAL_INCLUDE_DIRS += -I.. -I../.. -I../NGObjWeb
 
 ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_JS=$(GNUSTEP_BUILD_DIR)/../../../ThirdParty/js-1.5
-RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/..
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../skyrix-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../skyrix-xml
+RELBUILD_DIR_APPSERVER=$(GNUSTEP_BUILD_DIR)/..
+RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core
+RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
 
 ADDITIONAL_LIB_DIRS += \
        -L$(GNUSTEP_OBJ_DIR)                                            \
-        -L$(RELBUILD_DIR_SOPE)/WEExtensions/$(GNUSTEP_OBJ_DIR_NAME)    \
-        -L$(RELBUILD_DIR_SOPE)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)                \
-        -L$(RELBUILD_DIR_SOPE)/NGJavaScript/$(GNUSTEP_OBJ_DIR_NAME)    \
-        -L$(RELBUILD_DIR_SOPE)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME)      \
+        -L$(RELBUILD_DIR_APPSERVER)/WEExtensions/$(GNUSTEP_OBJ_DIR_NAME)\
+        -L$(RELBUILD_DIR_APPSERVER)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME)   \
+        -L$(RELBUILD_DIR_APPSERVER)/NGScripting/$(GNUSTEP_OBJ_DIR_NAME) \
         -L$(RELBUILD_DIR_SxCore)/NGMime/$(GNUSTEP_OBJ_DIR_NAME)        \
         -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)      \
         -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)   \
         -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)             \
         -L$(RELBUILD_DIR_SxXml)/XmlRpc/$(GNUSTEP_OBJ_DIR_NAME)         \
         -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)            \
-        -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)                \
-       -L$(RELBUILD_DIR_JS)/$(GNUSTEP_OBJ_DIR_NAME)
+        -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
 else
 ADDITIONAL_LIB_DIRS += \
        -L./$(GNUSTEP_OBJ_DIR)                  \
         -L../NGObjWeb/$(GNUSTEP_OBJ_DIR)        \
-        -L../NGJavaScript/$(GNUSTEP_OBJ_DIR)    \
         -L../NGScripting/$(GNUSTEP_OBJ_DIR)     \
-        -L../WEExtensions/$(GNUSTEP_OBJ_DIR)
+        -L../WEExtensions/$(GNUSTEP_OBJ_DIR)   \
+        -L../../sope-mime/$(GNUSTEP_OBJ_DIR)                   \
+        -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)         \
+        -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)      \
+        -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)         \
+        -L../../sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR)             \
+        -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)                        \
+        -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
 endif
 
 WOExtensions_BUNDLE_LIBS += -lWOExtensions -lWEExtensions

diff --git a/sope-appserver/WOExtensions/Version b/sope-appserver/WOExtensions/Version
index cf9e5c1262bbe256db9dcbe38538f8ad07693b99..27f42dca521c102631a68b11d5a0fab575d2dd28 100644 (file)
--- a/sope-appserver/WOExtensions/Version
+++ b/sope-appserver/WOExtensions/Version
@@ -1,3 +1,3 @@
 # $Id$
 
-SUBMINOR_VERSION:=15
+SUBMINOR_VERSION:=16