From 726d42c4485742d88ad7e87e741e15ed9af53b62 Mon Sep 17 00:00:00 2001 From: Matt Rice Date: Thu, 14 Sep 2006 21:11:01 +0000 Subject: [PATCH] * configure: Regenerate. * common.make: New file. * config.make.in: Remove. * GNUmakefile: Ditto. * GNUmakefile.in: New file, merges config.make.in and GNUmakefile. * configure.ac: Remove config.make.in, add GNUmakefile.in. * EOInterface/Makefile.preamble * EOInterface/GNUmakefile * EOAccess/Makefile.preamble * EOAccess/GNUmakefile * EOControl/GNUmakefile * EOControl/Makefile.preamble * DBModeler/GNUmakefile * Tools/Makefile.preamble * EOAdaptors/Postgres95/Makefile.preamble * GDL2Palette/GNUmakefile * gdl2.make.in * EOModeler/GNUmakefile * EOModeler/Makefile.preamble: Change to compile as native libraries. * DBModeler/Inspectors/AttributeInspector.gorm/data.info: * DBModeler/Inspectors/AttributeInspector.gorm/data.classes: * DBModeler/Inspectors/AttributeInspector.gorm/objects.gorm: Implement interface. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@23513 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 26 ++++++++ DBModeler/GNUmakefile | 17 ++--- .../AttributeInspector.gorm/data.classes | 33 ++++++++++ .../AttributeInspector.gorm/data.info | Bin 184 -> 184 bytes .../AttributeInspector.gorm/objects.gorm | Bin 9248 -> 19465 bytes DBModeler/Inspectors/GNUmakefile | 5 +- EOAccess/GNUmakefile | 19 +++--- EOAccess/Makefile.preamble | 7 ++- EOAdaptors/Postgres95/Makefile.preamble | 5 +- EOControl/GNUmakefile | 20 +++--- EOInterface/GNUmakefile | 2 +- EOInterface/Makefile.preamble | 7 ++- EOModeler/GNUmakefile | 13 ++-- EOModeler/Makefile.preamble | 7 ++- GDL2Palette/GNUmakefile | 21 ++----- GNUmakefile => GNUmakefile.in | 3 +- Tools/GNUmakefile | 1 + Tools/Makefile.preamble | 4 +- common.make | 6 ++ config.make.in | 3 - configure | 59 +++++++++++------- configure.ac | 2 +- gdl2.make.in | 2 +- 23 files changed, 163 insertions(+), 99 deletions(-) rename GNUmakefile => GNUmakefile.in (95%) create mode 100644 common.make delete mode 100644 config.make.in diff --git a/ChangeLog b/ChangeLog index 1afc0bb..f0a59a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2006-09-14 Matt Rice + + * configure: Regenerate. + * common.make: New file. + * config.make.in: Remove. + * GNUmakefile: Ditto. + * GNUmakefile.in: New file, merges config.make.in and GNUmakefile. + * configure.ac: Remove config.make.in, add GNUmakefile.in. + * EOInterface/Makefile.preamble + * EOInterface/GNUmakefile + * EOAccess/Makefile.preamble + * EOAccess/GNUmakefile + * EOControl/GNUmakefile + * EOControl/Makefile.preamble + * DBModeler/GNUmakefile + * Tools/Makefile.preamble + * EOAdaptors/Postgres95/Makefile.preamble + * GDL2Palette/GNUmakefile + * gdl2.make.in + * EOModeler/GNUmakefile + * EOModeler/Makefile.preamble: Change to compile as native libraries. + * DBModeler/Inspectors/AttributeInspector.gorm/data.info: + * DBModeler/Inspectors/AttributeInspector.gorm/data.classes: + * DBModeler/Inspectors/AttributeInspector.gorm/objects.gorm: Implement + interface. + 2006-09-14 David Ayers * EOAdaptors/Postgres95/GNUmakefile.in: diff --git a/DBModeler/GNUmakefile b/DBModeler/GNUmakefile index 6d55e98..922fbce 100644 --- a/DBModeler/GNUmakefile +++ b/DBModeler/GNUmakefile @@ -27,7 +27,6 @@ GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) include $(GNUSTEP_MAKEFILES)/common.make -include ../gdl2.make SUBPROJECTS=../EOInterface ../EOModeler include $(GNUSTEP_MAKEFILES)/aggregate.make @@ -35,18 +34,9 @@ include $(GNUSTEP_MAKEFILES)/aggregate.make APP_NAME = DBModeler DBModeler_SUBPROJECTS=Inspectors -ADDITIONAL_LIB_DIRS+=-L../EOAccess/$(GNUSTEP_OBJ_DIR) -ADDITIONAL_LIB_DIRS+=-L../EOControl/$(GNUSTEP_OBJ_DIR) - -ifeq ($(FOUNDATION_LIB), apple) -ADDITIONAL_LIB_DIRS+= -F../EOModeler -ADDITIONAL_INCLUDE_DIRS+= -F../EOModeler -else -ADDITIONAL_INCLUDE_DIRS= -I.. -ADDITIONAL_LIB_DIRS+=-L../EOInterface/$(GNUSTEP_OBJ_DIR) -L../EOModeler/$(GNUSTEP_OBJ_DIR) -endif - -ADDITIONAL_NATIVE_LIBS += EOInterface gnustep-db2modeler +ADDITIONAL_INCLUDE_DIRS+=-I../ +ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../EOInterface ../EOModeler +ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOInterface EOModeler $(APP_NAME)_RESOURCE_FILES = \ Resources/Key_On.tiff \ @@ -78,4 +68,5 @@ $(APP_NAME)_OBJC_FILES = \ Preferences.m \ ConsistencyChecker.m +include ../common.make include $(GNUSTEP_MAKEFILES)/application.make diff --git a/DBModeler/Inspectors/AttributeInspector.gorm/data.classes b/DBModeler/Inspectors/AttributeInspector.gorm/data.classes index c17c810..c4f4487 100644 --- a/DBModeler/Inspectors/AttributeInspector.gorm/data.classes +++ b/DBModeler/Inspectors/AttributeInspector.gorm/data.classes @@ -1,5 +1,29 @@ { "## Comment" = "Do NOT change this file, Gorm maintains it"; + AttributeInspector = { + Actions = ( + "setValueClassNameAndType:", + "setExternalName:", + "setExternalType:", + "setName:" + ); + Outlets = ( + _extNameField, + _extTypeField, + _flipView, + _nameField, + _flipSelect, + _customFlip, + _dataFlip, + _dateFlip, + _decimalFlip, + _doubleFlip, + _integerFlip, + _stringFlip, + _internalData + ); + Super = EOMInspector; + }; EOMInspector = { Actions = ( ); @@ -9,4 +33,13 @@ ); Super = NSObject; }; + FirstResponder = { + Actions = ( + "setValueClassNameAndType:", + "setExternalName:", + "setExternalType:", + "setName:" + ); + Super = NSObject; + }; } \ No newline at end of file diff --git a/DBModeler/Inspectors/AttributeInspector.gorm/data.info b/DBModeler/Inspectors/AttributeInspector.gorm/data.info index a98a343479136e23ceeda9b17c3c5ce4330472fd..5ffe3d471bb33531e39b78c66f75eeb2c0652395 100644 GIT binary patch delta 20 bcmdnNxPx(m2y?QL$wYBqW=2MaiRpm=J4^*8 delta 20 bcmdnNxPx(m2y)8hXe#f^nv)|18zc%Gt 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 Uv`Ftq^nGXwNbjH9iO&cA4{I*~cmMzZ literal 9248 zcmcgy34B~d8J~UGoSQpMN)I5F+l%j|cNJ-N)5M6~Mz*D(B5sn`bW3(O-Rw4rpw@g97QO1ITh~an>W{Yh_09KYzWKhH|9r>1 zne7X28Bbedozc|L_Sh~9@LyMS+uC(R0GQi^FwK?u8h~}+GkvPDFA|OohLVYNG?uVZ zN-3XdsG4wO)8GzkD2?w*fniptws2%)CLJ9dwR&Ph=~yxmO-)gw=~wmPh`UZ5j}6P9 z!mK1ok#s7S7{MAJ*9VS6vaTH;0l(U;EH$aps#nF38dbx}RLj9{R;fTZve}wU_r|Qz zVd`sEtJ-jc2AWEaaz%}*3P;X}SrhzLOFd4v#>bM0VVQ>_MJn6T5eVLj%7V>Gbp%4S zNOoU|WJiFS`QfNG6#n@PAI(5zvruW)sYZM1-KkVmW*tz~;Yi_CCMNoz%B)vSj=_hl zQ5vsdHV{zVj9tFYXExFt3U3OkbCsmnPb04+i2MeDkcAqvi8y<4`dC}Rs{C0VEDe_i zUHGH7d<{>69x|O-UIFKs6|APSP-`~R)I!P8Bw0g+f;t&gi#@0oBOD1w(V=rkQprq0q(DQiS=Z?RGzxpI&0fpwtcvE9 zorWd{3ma0cUu{J5NvMqKM`N;7T&;#?vqjb6%2|m_KaK zCZwLD5uhbNo7qZ;^v9zk7F8j`^utL&Z;d^R8eCa%SKUe& z%m7hF(^BcpD>d6Ptc4>{&r!lzG^r>YE%im1mr>OzjPp#&gk`AgMZ#NYPpZ-gPNl7J z4>LMOx;kyojzMs2j*VLa%6^O-q3b!IpqrKpD1~bFOGiLCE?38X$hHB;=j!1E(dtBp zonF@*5(ht#91TtqrDgo}#nLjLzrKY1^(1&{DQ4u}PJexwur%8%(rolaLYeV&G9DU@ zj*oAQj={@w6$}fUEX?&bbG^}@7$3u2luT`nB`}w@QBpy2I7yM;m8SlM$TCNwk0HqUEWu2)fVC=B45Eo!Sa6gPJbeoH42SDkJ&`=P}tAUWr!5}L%pa()U27 zR+Shglau7vjn0*zU;Y>+eHJ^gyAQ zHUgnlB|;0;#Y+kol(u4rJu>XYg zcLt0eYbX}ScoELT2d$KzU(O`TnG!k9%+#MqTO(Eq-coi#WyW(J$~nJuK0V0{e!#(7 zJ&MsC`bcN4dt1I=7T#W5dBU=%%{EgNXvX_@4Xy&E`SS# zy?ok}kbRK@L_Pu%5D)eU=zT5_-;W@EKy)9jko`eM?&4XI`;a%}vW(ot@Zq_TlaM`K zj2yw|I3;tNpABfS`F+HN+(!|)j~!m*KF-KpGAnYQ@P^zc8M#Z~Q}ZKtsRKE7TtUwE zP&aaRbun_Eb|Lo}MDDYtli-i%L*}oaW9;^ns?GcBW!|v+JY%;9zAzVd;;)xGvD=M7 zFNg=H81$~Dl$%A;b!2N-7i0HD7j{=5c3%?R&Y;&Dr2~bj&bXD{o*ecJB7dtL#K-fM z4B}O@f_Swz5WmbIUIky7AH-`MAj-KnZo3ZNb+2`S_*Dc^i|)e}^m2^cb+aOOy*K2( z#>iaie4 z;m_I3ZWHxoc6YZ+%Y3`LU$B|o2EP>cxpsHI$~D5Th0W<%^cleC4|J=;hY+)z!^x+4 z{z)G%a-_gOomUp<`rR!CI9;8)filL6KH`$WtOZpEYlxM-Qslvby zb-fMllm^$8OPSkRy&UfH#Mz}!gS$O(F4vpk9#5Pr^x3e_6X#038}9YQxk_IIe-uvV z*Ck$vPvHGH+$T+ZJ;9e=^?tQMZNmGXmvDp7toSOJ4)ec#yeDp9g=EOwvhNuM_@kE}`oV z`C&+cuihwtD19#P-+onu<)WSQ!gtPOr*!{24of8BbVU=G^;BP+? z_{)!^nt;FMmgr+JEd3qJJF)x+mQP^$Pb?qC@?Tg!h~>YrybH_!V0kx||HbkiEdPh) zek`BE^3iN|z^9OSj0hhRj}u`a@e~miNIXM?ABlD%Dv?-9L=_VIh^R*5ULtCcxSxnx zBpx854v9yI2q1BQh&2 { (exit 1); exit 1; }; } @@ -733,7 +733,7 @@ if test ! -r $srcdir/$ac_unique_file; then { (exit 1); exit 1; }; } fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || +(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null || { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` @@ -947,7 +947,7 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi @@ -1877,7 +1877,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -1935,7 +1936,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2051,7 +2053,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2105,7 +2108,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2150,7 +2154,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2194,7 +2199,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2517,7 +2523,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2687,7 +2694,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2827,7 +2835,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2975,7 +2984,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3062,7 +3072,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3135,7 +3146,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3232,7 +3244,7 @@ echo "${ECHO_T}$VERSION" >&6 #-------------------------------------------------------------------- # Write the Makefiles #-------------------------------------------------------------------- - ac_config_files="$ac_config_files gdl2.make config.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak" + ac_config_files="$ac_config_files gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3759,7 +3771,7 @@ do case "$ac_config_target" in # Handling of arguments. "gdl2.make" ) CONFIG_FILES="$CONFIG_FILES gdl2.make" ;; - "config.make" ) CONFIG_FILES="$CONFIG_FILES config.make" ;; + "GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; "EOAdaptors/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/GNUmakefile" ;; "EOAdaptors/Postgres95/GNUmakefile" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/Postgres95/GNUmakefile" ;; "EOAdaptors/Postgres95/config.mak" ) CONFIG_FILES="$CONFIG_FILES EOAdaptors/Postgres95/config.mak" ;; @@ -4033,6 +4045,11 @@ esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -4071,12 +4088,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;} fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub diff --git a/configure.ac b/configure.ac index 28c8f83..e62f62a 100644 --- a/configure.ac +++ b/configure.ac @@ -79,5 +79,5 @@ AC_SUBST(GCC_VERSION) #-------------------------------------------------------------------- # Write the Makefiles #-------------------------------------------------------------------- -AC_CONFIG_FILES([gdl2.make config.make EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak]) +AC_CONFIG_FILES([gdl2.make GNUmakefile EOAdaptors/GNUmakefile EOAdaptors/Postgres95/GNUmakefile EOAdaptors/Postgres95/config.mak]) AC_OUTPUT diff --git a/gdl2.make.in b/gdl2.make.in index ee09349..a66f318 100644 --- a/gdl2.make.in +++ b/gdl2.make.in @@ -41,6 +41,6 @@ GDL2_SUBMINOR_VERSION = @SUBMINOR_VERSION@ AUXILIARY_CPPFLAGS += -DGDL2=1 # Additional libraries for the linker -AUXILIARY_TOOL_LIBS += -lgnustep-db2 -lgnustep-db2control +ADDITIONAL_NATIVE_LIBS+=EOControl EOAccess endif