Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 302537D62 for ; Wed, 9 Nov 2011 20:20:48 +0000 (UTC) Received: (qmail 50921 invoked by uid 500); 9 Nov 2011 20:20:48 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 50900 invoked by uid 500); 9 Nov 2011 20:20:48 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 50892 invoked by uid 99); 9 Nov 2011 20:20:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Nov 2011 20:20:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Nov 2011 20:20:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 27EE623888EA; Wed, 9 Nov 2011 20:20:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1199946 - in /incubator/ooo/trunk/main/redland: raptor/ rasqal/ redland/ Date: Wed, 09 Nov 2011 20:20:25 -0000 To: ooo-commits@incubator.apache.org From: pfg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111109202026.27EE623888EA@eris.apache.org> Author: pfg Date: Wed Nov 9 20:20:25 2011 New Revision: 1199946 URL: http://svn.apache.org/viewvc?rev=1199946&view=rev Log: i118582: OS/2 port - redland patch by Yuri Dario. While here avoid patching stuff for past legal motivations. Added: incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.os2 incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.os2 incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.os2 Removed: incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.legal incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.legal incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.legal Modified: incubator/ooo/trunk/main/redland/raptor/makefile.mk incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake incubator/ooo/trunk/main/redland/rasqal/makefile.mk incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake incubator/ooo/trunk/main/redland/rasqal/rasqal2.map incubator/ooo/trunk/main/redland/redland/makefile.mk incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.dmake Modified: incubator/ooo/trunk/main/redland/raptor/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/raptor/makefile.mk?rev=1199946&r1=1199945&r2=1199946&view=diff ============================================================================== --- incubator/ooo/trunk/main/redland/raptor/makefile.mk (original) +++ incubator/ooo/trunk/main/redland/raptor/makefile.mk Wed Nov 9 20:20:25 2011 @@ -52,7 +52,6 @@ TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h OOO_PATCH_FILES= \ - $(TARFILE_NAME).patch.legal \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ @@ -64,7 +63,9 @@ PATCH_FILES=$(OOO_PATCH_FILES) .IF "$(OS)"=="OS2" BUILD_ACTION=dmake -BUILD_DIR=$(CONFIGURE_DIR)$/src +BUILD_DIR=$(CONFIGURE_DIR)/src +ADDITIONAL_FILES+=src/windows.h +OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw @@ -136,7 +137,7 @@ BUILD_DIR=$(CONFIGURE_DIR) .ENDIF -OUT2INC+=src$/raptor.h +OUT2INC+=src/raptor.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib Modified: incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake?rev=1199946&r1=1199945&r2=1199946&view=diff ============================================================================== --- incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake (original) +++ incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.dmake Wed Nov 9 20:20:25 2011 @@ -1,6 +1,6 @@ --- misc/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:25:51 2008 +++ misc/build/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:33:14 2008 -@@ -1,1 +1,119 @@ +@@ -1,1 +1,122 @@ -dummy +#************************************************************************* +# @@ -108,6 +108,9 @@ +SHL1IMPLIB= lib$(TARGET) + +#SHL1VERSIONMAP=../service/exports.map ++.IF "$(GUI)"=="OS2" ++SHL1VERSIONMAP=$(PRJ)/raptor/raptor2.map ++.ENDIF +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + Added: incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.os2 URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.os2?rev=1199946&view=auto ============================================================================== --- incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.os2 (added) +++ incubator/ooo/trunk/main/redland/raptor/raptor-1.4.18.patch.os2 Wed Nov 9 20:20:25 2011 @@ -0,0 +1,11 @@ +--- misc/raptor-1.4.18/src/windos.h Thu Nov 6 15:25:51 2008 ++++ misc/build/raptor-1.4.18/src/windows.h Thu Nov 6 15:33:14 2008 +@@ -1,1 +1,7 @@ +-dummy ++#define BOOL ++#define APIENTRY ++#define HANDLE int ++#define DWORD int ++#define LPVOID void* ++#define TRUE 1 ++#define FALSE 0 Modified: incubator/ooo/trunk/main/redland/rasqal/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/rasqal/makefile.mk?rev=1199946&r1=1199945&r2=1199946&view=diff ============================================================================== --- incubator/ooo/trunk/main/redland/rasqal/makefile.mk (original) +++ incubator/ooo/trunk/main/redland/rasqal/makefile.mk Wed Nov 9 20:20:25 2011 @@ -52,7 +52,6 @@ TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h OOO_PATCH_FILES= \ - $(TARFILE_NAME).patch.legal \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ @@ -64,6 +63,8 @@ PATCH_FILES=$(OOO_PATCH_FILES) .IF "$(OS)"=="OS2" BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src +ADDITIONAL_FILES+=src/windows.h +OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" rasqal_CC=$(CC) -mthreads Modified: incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake?rev=1199946&r1=1199945&r2=1199946&view=diff ============================================================================== --- incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake (original) +++ incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.dmake Wed Nov 9 20:20:25 2011 @@ -1,6 +1,6 @@ --- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008 +++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008 -@@ -1,1 +1,94 @@ +@@ -1,1 +1,97 @@ -dummy +#************************************************************************* +# @@ -82,6 +82,9 @@ +SHL1IMPLIB= lib$(TARGET) + +#SHL1VERSIONMAP=../service/exports.map ++.IF "$(GUI)"=="OS2" ++SHL1VERSIONMAP=$(PRJ)/rasqal/rasqal2.map ++.ENDIF +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + Added: incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.os2 URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.os2?rev=1199946&view=auto ============================================================================== --- incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.os2 (added) +++ incubator/ooo/trunk/main/redland/rasqal/rasqal-0.9.16.patch.os2 Wed Nov 9 20:20:25 2011 @@ -0,0 +1,5 @@ +--- misc/rasqal-0.9.16/src/windos.h Thu Nov 6 15:25:51 2008 ++++ misc/build/rasqal-0.9.16/src/windows.h Thu Nov 6 15:33:14 2008 +@@ -1,1 +1,1 @@ +-dummy ++/* dummy */ Modified: incubator/ooo/trunk/main/redland/rasqal/rasqal2.map URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/rasqal/rasqal2.map?rev=1199946&r1=1199945&r2=1199946&view=diff ============================================================================== --- incubator/ooo/trunk/main/redland/rasqal/rasqal2.map (original) +++ incubator/ooo/trunk/main/redland/rasqal/rasqal2.map Wed Nov 9 20:20:25 2011 @@ -46,7 +46,7 @@ rasqal_variable_print; rasqal_expression_print; rasqal_expression_print_op; rasqal_triple_print; -rasqal_expression_foreach; +#rasqal_expression_foreach; rasqal_expression_visit; rasqal_new_expression_from_expression; rasqal_triple_get_origin; @@ -64,8 +64,8 @@ rasqal_home_url_string; rasqal_license_string; rasqal_copyright_string; rasqal_short_copyright_string; -rasqal_init; -rasqal_finish; +#rasqal_init; +#rasqal_finish; rasqal_language_name_check; rasqal_query_set_default_generate_bnodeid_parameters; rasqal_free_memory; @@ -76,7 +76,7 @@ rasqal_languages_enumerate; rasqal_graph_pattern_add_constraint; rasqal_graph_pattern_print; rasqal_graph_pattern_add_sub_graph_pattern; -rasqal_graph_pattern_get_flags; +#rasqal_graph_pattern_get_flags; rasqal_graph_pattern_visit; rasqal_graph_pattern_get_constraint; rasqal_graph_pattern_get_triple; @@ -86,7 +86,7 @@ rasqal_graph_pattern_get_index; rasqal_graph_pattern_operator_as_string; rasqal_graph_pattern_get_operator; rasqal_graph_pattern_get_constraint_sequence; -rasqal_new_floating_literal; +#rasqal_new_floating_literal; rasqal_literal_compare; rasqal_literal_equals; rasqal_new_double_literal; @@ -188,7 +188,9 @@ rasqal_query_results_formats_check; rasqal_new_query_results_formatter; rasqal_new_query_results_formatter_by_mime_type; rasqal_query_results_formats_enumerate; -rasqal_query_results_formats_enumerate_full; +#rasqal_query_results_formats_enumerate_full; rasqal_free_query_results_formatter; rasqal_query_results_formatter_get_mime_type; +rasqal_free_world; +rasqal_new_world; }; Modified: incubator/ooo/trunk/main/redland/redland/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/redland/makefile.mk?rev=1199946&r1=1199945&r2=1199946&view=diff ============================================================================== --- incubator/ooo/trunk/main/redland/redland/makefile.mk (original) +++ incubator/ooo/trunk/main/redland/redland/makefile.mk Wed Nov 9 20:20:25 2011 @@ -52,7 +52,6 @@ TARFILE_MD5=ca66e26082cab8bb817185a116db ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h OOO_PATCH_FILES= \ - $(TARFILE_NAME).patch.legal \ $(TARFILE_NAME).patch.autotools \ $(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.ooo_build \ @@ -64,6 +63,8 @@ PATCH_FILES=$(OOO_PATCH_FILES) \ .IF "$(OS)"=="OS2" BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/librdf +ADDITIONAL_FILES+=librdf/windows.h +OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2 .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" redland_CC=$(CC) -mthreads Modified: incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.dmake URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.dmake?rev=1199946&r1=1199945&r2=1199946&view=diff ============================================================================== --- incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.dmake (original) +++ incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.dmake Wed Nov 9 20:20:25 2011 @@ -1,6 +1,6 @@ --- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008 +++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008 -@@ -1,1 +1,111 @@ +@@ -1,1 +1,114 @@ -dummy +#************************************************************************* +# @@ -97,6 +97,9 @@ +SHL1USE_EXPORTS=name + +#SHL1VERSIONMAP=../service/exports.map ++.IF "$(GUI)"=="OS2" ++SHL1VERSIONMAP=$(PRJ)/redland/redland2.map ++.ENDIF +SHL1DEF=$(MISC)$/$(SHL1TARGET).def +DEF1NAME=$(SHL1TARGET) + Added: incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.os2 URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.os2?rev=1199946&view=auto ============================================================================== --- incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.os2 (added) +++ incubator/ooo/trunk/main/redland/redland/redland-1.0.8.patch.os2 Wed Nov 9 20:20:25 2011 @@ -0,0 +1,12 @@ +--- misc/redland-1.0.8/librdf/windos.h Thu Nov 6 15:25:51 2008 ++++ misc/build/redland-1.0.8/librdf/windows.h Thu Nov 6 15:33:14 2008 +@@ -1,1 +1,8 @@ +-dummy ++#define BOOL ++#define APIENTRY ++#define HANDLE int ++#define DWORD int ++#define LPVOID void* ++#define TRUE 1 ++#define FALSE 0 ++typedef unsigned long long __int64;