From a73ec2fc3587206735ee07feb99e2018c8cc0580 Mon Sep 17 00:00:00 2001 From: ayers Date: Wed, 18 Feb 2009 17:21:05 +0000 Subject: [PATCH] * Documentation/GDL2Intro/Examples: Move to ... * Examples: ... here. * Examples/GNUmakefile: Adapt to new location. * Documentation/GDL2Intro/GNUmakefile: Remove subproject. * Documentation/GDL2Intro/GDL2Intro.texi: Update references to new location. * Trading: Move to ... * Examples/Trading: ... here. * Examples/Trading/GNUmakefile: Adapte to new location. * Examples/GNUmakefile: Add Trading. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@27918 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 13 ++++++++++++- Documentation/GDL2Intro/GDL2Intro.texi | 12 ++++++------ Documentation/GDL2Intro/GNUmakefile | 3 --- .../GDL2Intro/Examples => Examples}/GNUmakefile | 7 +++++-- .../Examples => Examples}/GNUmakefile.connection | 0 .../Examples => Examples}/GNUmakefile.eoexample | 0 .../Examples => Examples}/GNUmakefile.eoexample2 | 0 {Trading => Examples/Trading}/GNUmakefile | 15 +++++++++------ .../Trading}/Trading.eomodeld/Customer.plist | 0 .../Trading}/Trading.eomodeld/CustomerGroup.plist | 0 .../Trading.eomodeld/EOPostgreSQLPrototypes.plist | 0 .../Trading.eomodeld/EOPostgres95Prototypes.plist | 0 .../Trading.eomodeld/EOSQLite3Prototypes.plist | 0 .../Trading}/Trading.eomodeld/Order.plist | 0 .../Trading}/Trading.eomodeld/OrderPos.plist | 0 .../Trading}/Trading.eomodeld/PriceList.plist | 0 .../Trading}/Trading.eomodeld/PriceListPos.plist | 0 .../Trading}/Trading.eomodeld/Product.plist | 0 .../Trading}/Trading.eomodeld/ProductGroup.plist | 0 .../Trading}/Trading.eomodeld/Supplier.plist | 0 .../Trading}/Trading.eomodeld/index.eomodeld | 0 .../Trading.eomodeld/procName.storedProcedure | 0 {Trading => Examples/Trading}/Trading.h | 0 {Trading => Examples/Trading}/Trading.m | 0 {Trading => Examples/Trading}/TradingData.h | 0 {Trading => Examples/Trading}/TradingData.m | 0 {Trading => Examples/Trading}/create.m | 0 .../GDL2Intro/Examples => Examples}/connection.m | 0 .../GDL2Intro/Examples => Examples}/eoexample.m | 0 .../GDL2Intro/Examples => Examples}/eoexample2.m | 0 .../Examples => Examples}/example.GNUmakefile | 0 .../Examples => Examples}/library.eomodel | 0 32 files changed, 32 insertions(+), 18 deletions(-) rename {Documentation/GDL2Intro/Examples => Examples}/GNUmakefile (75%) rename {Documentation/GDL2Intro/Examples => Examples}/GNUmakefile.connection (100%) rename {Documentation/GDL2Intro/Examples => Examples}/GNUmakefile.eoexample (100%) rename {Documentation/GDL2Intro/Examples => Examples}/GNUmakefile.eoexample2 (100%) rename {Trading => Examples/Trading}/GNUmakefile (58%) rename {Trading => Examples/Trading}/Trading.eomodeld/Customer.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/CustomerGroup.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/EOPostgreSQLPrototypes.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/EOPostgres95Prototypes.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/EOSQLite3Prototypes.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/Order.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/OrderPos.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/PriceList.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/PriceListPos.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/Product.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/ProductGroup.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/Supplier.plist (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/index.eomodeld (100%) rename {Trading => Examples/Trading}/Trading.eomodeld/procName.storedProcedure (100%) rename {Trading => Examples/Trading}/Trading.h (100%) rename {Trading => Examples/Trading}/Trading.m (100%) rename {Trading => Examples/Trading}/TradingData.h (100%) rename {Trading => Examples/Trading}/TradingData.m (100%) rename {Trading => Examples/Trading}/create.m (100%) rename {Documentation/GDL2Intro/Examples => Examples}/connection.m (100%) rename {Documentation/GDL2Intro/Examples => Examples}/eoexample.m (100%) rename {Documentation/GDL2Intro/Examples => Examples}/eoexample2.m (100%) rename {Documentation/GDL2Intro/Examples => Examples}/example.GNUmakefile (100%) rename {Documentation/GDL2Intro/Examples => Examples}/library.eomodel (100%) diff --git a/ChangeLog b/ChangeLog index a759331..4a493d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,18 @@ (enable-gorm-palette): Default to the setting for enable-gui-projects. * configure: Regenerate. * GNUmakefile.in: Extract all GUI libs into variable. - + + * Documentation/GDL2Intro/Examples: Move to ... + * Examples: ... here. + * Examples/GNUmakefile: Adapt to new location. + * Documentation/GDL2Intro/GNUmakefile: Remove subproject. + * Documentation/GDL2Intro/GDL2Intro.texi: Update references to new + location. + * Trading: Move to ... + * Examples/Trading: ... here. + * Examples/Trading/GNUmakefile: Adapte to new location. + * Examples/GNUmakefile: Add Trading. + 2009-02-18 Matt Rice * GNUmakefile.in: Add Trading subproject. diff --git a/Documentation/GDL2Intro/GDL2Intro.texi b/Documentation/GDL2Intro/GDL2Intro.texi index fcd60c5..2242e86 100644 --- a/Documentation/GDL2Intro/GDL2Intro.texi +++ b/Documentation/GDL2Intro/GDL2Intro.texi @@ -46,7 +46,7 @@ provide a starting point for people unfamiliar with GDL2 or EOF to get started developing their first application. If you are reading this document from the GDL2 Sources, most example sources -are provided in the Examples/ directory. +are provided in the ../../Examples/ directory. @menu * Concepts:: Important concepts @@ -668,7 +668,7 @@ for the sake of demonstration i'm ignoring books with multiple authors. it also contains an adaptor name, and an adaptor specific connection dictionary. -@verbatiminclude Examples/library.eomodel +@verbatiminclude ../../Examples/library.eomodel @node Creating with DBModeler, , Example model file, Model creation @subsection Creating with DBModeler @@ -737,7 +737,7 @@ foo_RESOURCE_FILES=foo.eomodeld @subsection A complete GNUmakefile @example -@verbatiminclude Examples/example.GNUmakefile +@verbatiminclude ../../Examples/example.GNUmakefile @end example @node Database creation, Database connection, Project creation, Top @@ -759,7 +759,7 @@ An example which connects to and then disconnects from the database. provided you have already created the database in previous section @example -@verbatiminclude Examples/connection.m +@verbatiminclude ../../Examples/connection.m @end example @node Working with data, EOInterface, Database connection, Top @@ -770,7 +770,7 @@ Here we have more complete example which writes a record to the database, then fetches the record and updates it and saves the data again, then removes the record. @example -@verbatiminclude Examples/eoexample.m +@verbatiminclude ../../Examples/eoexample.m @end example @section Working with relationships @@ -779,7 +779,7 @@ we'll add an author, and some books, and then traverse the relationship in a couple of different ways. @example -@verbatiminclude Examples/eoexample2.m +@verbatiminclude ../../Examples/eoexample2.m @end example @node EOInterface, Index, Working with data, Top diff --git a/Documentation/GDL2Intro/GNUmakefile b/Documentation/GDL2Intro/GNUmakefile index 5001134..c15bf46 100644 --- a/Documentation/GDL2Intro/GNUmakefile +++ b/Documentation/GDL2Intro/GNUmakefile @@ -4,10 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME="GDL2Intro" DOCUMENT_NAME=GDL2Intro -SUBPROJECTS=Examples - GDL2Intro_TEXI_FILES=GDL2Intro.texi -include $(GNUSTEP_MAKEFILES)/aggregate.make include $(GNUSTEP_MAKEFILES)/documentation.make diff --git a/Documentation/GDL2Intro/Examples/GNUmakefile b/Examples/GNUmakefile similarity index 75% rename from Documentation/GDL2Intro/Examples/GNUmakefile rename to Examples/GNUmakefile index e5ff616..71f1fd8 100644 --- a/Documentation/GDL2Intro/Examples/GNUmakefile +++ b/Examples/GNUmakefile @@ -1,16 +1,19 @@ -include ../../../common.make +include ../common.make include $(GNUSTEP_MAKEFILES)/common.make include $(GNUSTEP_MAKEFILES)/Auxiliary/gdl2.make +SUBPROJECTS = Trading + ADDITIONAL_NATIVE_LIBS=EOAccess EOControl # This is strictly for integration into the gdl2 build system # If you are basing a gdl2 application off of these examples # you won't need the following line in your GNUmakefiles. -ADDITIONAL_NATIVE_LIB_DIRS=../../../EOAccess ../../../EOControl +ADDITIONAL_NATIVE_LIB_DIRS=../EOAccess ../EOControl include GNUmakefile.eoexample include GNUmakefile.connection include GNUmakefile.eoexample2 +include $(GNUSTEP_MAKEFILES)/aggregate.make include $(GNUSTEP_MAKEFILES)/tool.make diff --git a/Documentation/GDL2Intro/Examples/GNUmakefile.connection b/Examples/GNUmakefile.connection similarity index 100% rename from Documentation/GDL2Intro/Examples/GNUmakefile.connection rename to Examples/GNUmakefile.connection diff --git a/Documentation/GDL2Intro/Examples/GNUmakefile.eoexample b/Examples/GNUmakefile.eoexample similarity index 100% rename from Documentation/GDL2Intro/Examples/GNUmakefile.eoexample rename to Examples/GNUmakefile.eoexample diff --git a/Documentation/GDL2Intro/Examples/GNUmakefile.eoexample2 b/Examples/GNUmakefile.eoexample2 similarity index 100% rename from Documentation/GDL2Intro/Examples/GNUmakefile.eoexample2 rename to Examples/GNUmakefile.eoexample2 diff --git a/Trading/GNUmakefile b/Examples/Trading/GNUmakefile similarity index 58% rename from Trading/GNUmakefile rename to Examples/Trading/GNUmakefile index 1ac80c5..faa96d5 100644 --- a/Trading/GNUmakefile +++ b/Examples/Trading/GNUmakefile @@ -1,7 +1,7 @@ -include ../common.make +include ../../common.make include $(GNUSTEP_MAKEFILES)/common.make -include ../Version -include ../common.make +include ../../Version +include ../../common.make NATIVE_LIBRARY_NAME=Trading TOOL_NAME=createTradingDB @@ -13,11 +13,14 @@ Trading_OBJC_FILES=Trading.m TradingData.m Trading_HEADER_FILES=Trading.h TradingData.h createTradingDB_OBJC_FILES=create.m +createTradingDB_NATIVE_LIBS+= Trading -ADDITIONAL_INCLUDE_DIRS+=-I.. +ADDITIONAL_INCLUDE_DIRS+=-I../.. -ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl Trading -ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../Trading +ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl +ADDITIONAL_NATIVE_LIB_DIRS+=../../EOAccess ../../EOControl + +ADDITIONAL_NATIVE_LIB_DIRS+= . include $(GNUSTEP_MAKEFILES)/native-library.make include $(GNUSTEP_MAKEFILES)/tool.make diff --git a/Trading/Trading.eomodeld/Customer.plist b/Examples/Trading/Trading.eomodeld/Customer.plist similarity index 100% rename from Trading/Trading.eomodeld/Customer.plist rename to Examples/Trading/Trading.eomodeld/Customer.plist diff --git a/Trading/Trading.eomodeld/CustomerGroup.plist b/Examples/Trading/Trading.eomodeld/CustomerGroup.plist similarity index 100% rename from Trading/Trading.eomodeld/CustomerGroup.plist rename to Examples/Trading/Trading.eomodeld/CustomerGroup.plist diff --git a/Trading/Trading.eomodeld/EOPostgreSQLPrototypes.plist b/Examples/Trading/Trading.eomodeld/EOPostgreSQLPrototypes.plist similarity index 100% rename from Trading/Trading.eomodeld/EOPostgreSQLPrototypes.plist rename to Examples/Trading/Trading.eomodeld/EOPostgreSQLPrototypes.plist diff --git a/Trading/Trading.eomodeld/EOPostgres95Prototypes.plist b/Examples/Trading/Trading.eomodeld/EOPostgres95Prototypes.plist similarity index 100% rename from Trading/Trading.eomodeld/EOPostgres95Prototypes.plist rename to Examples/Trading/Trading.eomodeld/EOPostgres95Prototypes.plist diff --git a/Trading/Trading.eomodeld/EOSQLite3Prototypes.plist b/Examples/Trading/Trading.eomodeld/EOSQLite3Prototypes.plist similarity index 100% rename from Trading/Trading.eomodeld/EOSQLite3Prototypes.plist rename to Examples/Trading/Trading.eomodeld/EOSQLite3Prototypes.plist diff --git a/Trading/Trading.eomodeld/Order.plist b/Examples/Trading/Trading.eomodeld/Order.plist similarity index 100% rename from Trading/Trading.eomodeld/Order.plist rename to Examples/Trading/Trading.eomodeld/Order.plist diff --git a/Trading/Trading.eomodeld/OrderPos.plist b/Examples/Trading/Trading.eomodeld/OrderPos.plist similarity index 100% rename from Trading/Trading.eomodeld/OrderPos.plist rename to Examples/Trading/Trading.eomodeld/OrderPos.plist diff --git a/Trading/Trading.eomodeld/PriceList.plist b/Examples/Trading/Trading.eomodeld/PriceList.plist similarity index 100% rename from Trading/Trading.eomodeld/PriceList.plist rename to Examples/Trading/Trading.eomodeld/PriceList.plist diff --git a/Trading/Trading.eomodeld/PriceListPos.plist b/Examples/Trading/Trading.eomodeld/PriceListPos.plist similarity index 100% rename from Trading/Trading.eomodeld/PriceListPos.plist rename to Examples/Trading/Trading.eomodeld/PriceListPos.plist diff --git a/Trading/Trading.eomodeld/Product.plist b/Examples/Trading/Trading.eomodeld/Product.plist similarity index 100% rename from Trading/Trading.eomodeld/Product.plist rename to Examples/Trading/Trading.eomodeld/Product.plist diff --git a/Trading/Trading.eomodeld/ProductGroup.plist b/Examples/Trading/Trading.eomodeld/ProductGroup.plist similarity index 100% rename from Trading/Trading.eomodeld/ProductGroup.plist rename to Examples/Trading/Trading.eomodeld/ProductGroup.plist diff --git a/Trading/Trading.eomodeld/Supplier.plist b/Examples/Trading/Trading.eomodeld/Supplier.plist similarity index 100% rename from Trading/Trading.eomodeld/Supplier.plist rename to Examples/Trading/Trading.eomodeld/Supplier.plist diff --git a/Trading/Trading.eomodeld/index.eomodeld b/Examples/Trading/Trading.eomodeld/index.eomodeld similarity index 100% rename from Trading/Trading.eomodeld/index.eomodeld rename to Examples/Trading/Trading.eomodeld/index.eomodeld diff --git a/Trading/Trading.eomodeld/procName.storedProcedure b/Examples/Trading/Trading.eomodeld/procName.storedProcedure similarity index 100% rename from Trading/Trading.eomodeld/procName.storedProcedure rename to Examples/Trading/Trading.eomodeld/procName.storedProcedure diff --git a/Trading/Trading.h b/Examples/Trading/Trading.h similarity index 100% rename from Trading/Trading.h rename to Examples/Trading/Trading.h diff --git a/Trading/Trading.m b/Examples/Trading/Trading.m similarity index 100% rename from Trading/Trading.m rename to Examples/Trading/Trading.m diff --git a/Trading/TradingData.h b/Examples/Trading/TradingData.h similarity index 100% rename from Trading/TradingData.h rename to Examples/Trading/TradingData.h diff --git a/Trading/TradingData.m b/Examples/Trading/TradingData.m similarity index 100% rename from Trading/TradingData.m rename to Examples/Trading/TradingData.m diff --git a/Trading/create.m b/Examples/Trading/create.m similarity index 100% rename from Trading/create.m rename to Examples/Trading/create.m diff --git a/Documentation/GDL2Intro/Examples/connection.m b/Examples/connection.m similarity index 100% rename from Documentation/GDL2Intro/Examples/connection.m rename to Examples/connection.m diff --git a/Documentation/GDL2Intro/Examples/eoexample.m b/Examples/eoexample.m similarity index 100% rename from Documentation/GDL2Intro/Examples/eoexample.m rename to Examples/eoexample.m diff --git a/Documentation/GDL2Intro/Examples/eoexample2.m b/Examples/eoexample2.m similarity index 100% rename from Documentation/GDL2Intro/Examples/eoexample2.m rename to Examples/eoexample2.m diff --git a/Documentation/GDL2Intro/Examples/example.GNUmakefile b/Examples/example.GNUmakefile similarity index 100% rename from Documentation/GDL2Intro/Examples/example.GNUmakefile rename to Examples/example.GNUmakefile diff --git a/Documentation/GDL2Intro/Examples/library.eomodel b/Examples/library.eomodel similarity index 100% rename from Documentation/GDL2Intro/Examples/library.eomodel rename to Examples/library.eomodel