diff --git a/ChangeLog b/ChangeLog index 8cd0815..ffe1a0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,14 @@ +2005-07-17 Adam Fedor + + * Version: Add interface version number + * Source/GNUmakefile: Use it. + * Source/GNUmakefile.postamble: Idem, add custom Info.plist. + * Source/GNUmakefile.preamble: Update for interface version. + 2005-07-14 Adam Fedor - * Source/winlib/WIN32GState.m ([WIN32GState -compositeGState:...]): Fall - through to default operation if alpha blend not sucessful. + * Source/winlib/WIN32GState.m ([WIN32GState -compositeGState:...]): + Fall through to default operation if alpha blend not sucessful. 2005-07-09 Fred Kiefer diff --git a/Documentation/Back/Back.gsdoc b/Documentation/Back/Back.gsdoc index 7c6ab89..2e5cd9f 100644 --- a/Documentation/Back/Back.gsdoc +++ b/Documentation/Back/Back.gsdoc @@ -7,9 +7,9 @@ - 2005 Free Software Foundation, Inc. $Revision$ $Date$ + 2005 Free Software Foundation, Inc. diff --git a/Documentation/Back/DefaultsSummary.gsdoc b/Documentation/Back/DefaultsSummary.gsdoc index dd8e5ca..26c6f0f 100644 --- a/Documentation/Back/DefaultsSummary.gsdoc +++ b/Documentation/Back/DefaultsSummary.gsdoc @@ -7,9 +7,9 @@ - 2005 Free Software Foundation, Inc. $Revision$ $Date$ + 2005 Free Software Foundation, Inc. diff --git a/Documentation/Back/WindowFocus.gsdoc b/Documentation/Back/WindowFocus.gsdoc index 3a4ae1f..c4cf8d5 100644 --- a/Documentation/Back/WindowFocus.gsdoc +++ b/Documentation/Back/WindowFocus.gsdoc @@ -7,9 +7,9 @@ - 2005 Free Software Foundation, Inc. $Revision$ $Date$ + 2005 Free Software Foundation, Inc. diff --git a/Source/GNUmakefile b/Source/GNUmakefile index b1a5af1..9c77079 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -29,11 +29,16 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../config.make +include ../Version + + # The library to be compiled, as a library or as a bundle ifeq ($(BACKEND_BUNDLE),) -LIBRARY_NAME=libgnustep-$(BACKEND_NAME) +BACKEND_FULL=$(BACKEND_NAME) +LIBRARY_NAME=libgnustep-$(BACKEND_FULL) else -BUNDLE_NAME=libgnustep-$(BACKEND_NAME) +BACKEND_FULL=$(BACKEND_NAME)-$(INTERFACE_VERSION_NUMBER) +BUNDLE_NAME=libgnustep-$(BACKEND_FULL) endif # @@ -41,15 +46,15 @@ endif # SUBPROJECTS = gsc $(BUILD_SERVER) $(BUILD_GRAPHICS) -libgnustep-$(BACKEND_NAME)_SUBPROJECTS=$(SUBPROJECTS) +libgnustep-$(BACKEND_FULL)_SUBPROJECTS=$(SUBPROJECTS) -libgnustep-$(BACKEND_NAME)_OBJC_FILES=GSBackend.m +libgnustep-$(BACKEND_FULL)_OBJC_FILES=GSBackend.m -libgnustep-$(BACKEND_NAME)_PRINCIPAL_CLASS=GSBackend +libgnustep-$(BACKEND_FULL)_PRINCIPAL_CLASS=GSBackend -libgnustep-$(BACKEND_NAME)_LOCALIZED_RESOURCE_FILES=nfontFaceNames.strings +libgnustep-$(BACKEND_FULL)_LOCALIZED_RESOURCE_FILES=nfontFaceNames.strings -libgnustep-$(BACKEND_NAME)_LANGUAGES=English Swedish +libgnustep-$(BACKEND_FULL)_LANGUAGES=English Swedish -include GNUmakefile.preamble diff --git a/Source/GNUmakefile.postamble b/Source/GNUmakefile.postamble index 7ca626e..f170a40 100644 --- a/Source/GNUmakefile.postamble +++ b/Source/GNUmakefile.postamble @@ -23,7 +23,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Things to do before compiling -before-all:: $(GNUSTEP_TARGET_DIR)/config.h +before-all:: $(GNUSTEP_TARGET_DIR)/config.h $(BUNDLE_NAME)Info.plist # Things to do after compiling # after-all:: @@ -66,3 +66,15 @@ after-distclean:: $(GNUSTEP_TARGET_DIR)/config.h: ../config.status $(GNUSTEP_MAKEFILES)/mkinstalldirs $(GNUSTEP_TARGET_DIR) -cp ../config.h $(GNUSTEP_TARGET_DIR) + + +# +# Make an Info.plist for the bundle +# +$(BUNDLE_NAME)Info.plist: + $(ECHO_CREATING)(echo "{"; \ + echo " GSBundleShortVersionString = \"$(VERSION)\";"; \ + echo " GSBundleVersion = $(VERSION_NUMBER);"; \ + echo " CFBundleShortVersionString = \"$(VERSION)\";"; \ + echo " CFBundleVersion = $(VERSION_NUMBER);"; \ + echo "}") > $@$(END_ECHO) diff --git a/Source/GNUmakefile.preamble b/Source/GNUmakefile.preamble index 8519eb0..80dd52b 100644 --- a/Source/GNUmakefile.preamble +++ b/Source/GNUmakefile.preamble @@ -49,10 +49,10 @@ ADDITIONAL_LIB_DIRS += $(GRAPHIC_LFLAGS) # Flags for compiling as a bundle or library (if the system depends # on having libraries specified). # -libgnustep-$(BACKEND_NAME)_BUNDLE_LIBS = $(GRAPHIC_LIBS) +libgnustep-$(BACKEND_FULL)_BUNDLE_LIBS = $(GRAPHIC_LIBS) ifeq ($(BACKEND_BUNDLE),) -libgnustep-$(BACKEND_NAME)_LIBRARIES_DEPEND_UPON = $(GRAPHIC_LIBS) +libgnustep-$(BACKEND_FULL)_LIBRARIES_DEPEND_UPON = $(GRAPHIC_LIBS) endif diff --git a/Version b/Version index 3095b5c..6c4af80 100644 --- a/Version +++ b/Version @@ -5,6 +5,11 @@ GNUSTEP_BACK_MAJOR_VERSION=0 GNUSTEP_BACK_MINOR_VERSION=9 GNUSTEP_BACK_SUBMINOR_VERSION=5 +# This numeric value should match above +VERSION_NUMBER=009.5 +# This numeric value should match the compatible gui interface version +INTERFACE_VERSION_NUMBER=009 + GNUSTEP_BACK_VERSION=${GNUSTEP_BACK_MAJOR_VERSION}.${GNUSTEP_BACK_MINOR_VERSION}.${GNUSTEP_BACK_SUBMINOR_VERSION} VERSION=${GNUSTEP_BACK_VERSION}