[frontierkernel-commits] Frontier/build_GNU .cvsignore,NONE,1.1, Info.plist,1.1,1.2, Makefile,1.4,1.5,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/build_GNU
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14244

Modified Files:
	Info.plist Makefile 
Added Files:
	.cvsignore 
Log Message:
Fixed breakage in Makefile related to my recent changes in Common/headers/versions.h. The Info.plist file in the application package should now be generated correctly again.

Index: Info.plist
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_GNU/Info.plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Info.plist	3 Jan 2005 00:41:02 -0000	1.1
--- Info.plist	10 Feb 2006 21:21:15 -0000	1.2
***************
*** 155,159 ****
  	<string>${PRODUCT_NAME_STR}</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>${PRODUCT_VERSION_STR}; © 1992-${COPYRIGHT_YEAR_STR} Userland Software, Inc.</string>
  	<key>CFBundleIconFile</key>
  	<string>Frontier.icns</string>
--- 155,159 ----
  	<string>${PRODUCT_NAME_STR}</string>
  	<key>CFBundleGetInfoString</key>
! 	<string>${PRODUCT_VERSION_STR}; © ${PRODUCT_COPYRIGHT_STR}</string>
  	<key>CFBundleIconFile</key>
  	<string>Frontier.icns</string>

--- NEW FILE: .cvsignore ---
.ranlib
Frontier.app
Frontier.rsrc

Index: Makefile
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/build_GNU/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile	20 Dec 2005 22:04:06 -0000	1.4
--- Makefile	10 Feb 2006 21:21:15 -0000	1.5
***************
*** 1133,1136 ****
--- 1133,1137 ----
  	$(COMMON_OBJECTS)
  
+ 
  #================================================================================================
  # Resources Definitions
***************
*** 1214,1218 ****
  	esac
  
! MAC_$(PROJECT):	$(MAC_OBJECTS) $(BINDIR)/$(PROJECT).rsrc $(MAC_PAIGE_LIB_AR)
  	if [ ! -f ".ranlib" ]; then \
  		$(RANLIB) $(MAC_PAIGE_LIB_AR); \
--- 1215,1219 ----
  	esac
  
! MAC_$(PROJECT):	$(MAC_OBJECTS) $(BINDIR)/$(PROJECT).rsrc $(MAC_PAIGE_LIB_AR) $(MAC_INFOPLIST_OBJS)
  	if [ ! -f ".ranlib" ]; then \
  		$(RANLIB) $(MAC_PAIGE_LIB_AR); \
***************
*** 1228,1232 ****
  	mkdir -p $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)
  	
! 	# Copy Mach-O bimary
  	mv $(PROJECT) $(BUILT_PRODUCTS_DIR)/$(EXECUTABLE_FOLDER_PATH)
  	
--- 1229,1233 ----
  	mkdir -p $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)
  	
! 	# Copy Mach-O binary
  	mv $(PROJECT) $(BUILT_PRODUCTS_DIR)/$(EXECUTABLE_FOLDER_PATH)
  	
***************
*** 1241,1261 ****
  	$(RESMERGER) $(BINDIR)/$(PROJECT).rsrc -dstIs DF -o $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(PROJECT).rsrc
  	
! 	# Strip trademark character to prevent problems with shell quoting \
! 	#product_str=`echo $(PROJECT) | awk -F '\342' '{print $1};'`; \
! 
! 	# Parse the "versions.h" file for useful variables \
! 
! 	# Update the Info.plist \
! 	# Could append "(dbg)" to product name for Development build style \
! 	#defaults write $(BUILT_PRODUCTS_DIR)/$(CONTENTS_FOLDER_PATH)/Info CFBundleVersion $${version_str}; \
! 	# or use sed \
  
  	( \
  		product_str=$(PROJECT); \
  		\
! 		version_str=`grep "frontier_version_string" $(SRCDIR)/Common/headers/versions.h | awk -F \" '{print $$2};'`; \
! 		copyright_year_str=`grep "copyright_year_string" $(SRCDIR)/Common/headers/versions.h | awk -F \" '{print $$2};'`; \
  		\
! 		sed -e "s/\$${PRODUCT_NAME_STR}/$${product_str}/g" -e "s/\$${PRODUCT_VERSION_STR}/$${version_str}/g" -e "s/\$${COPYRIGHT_YEAR_STR}/$${copyright_year_str}/g" $(SRCROOT)/Info.plist > $(BUILT_PRODUCTS_DIR)/$(CONTENTS_FOLDER_PATH)/Info.plist; \
  	)
  	
--- 1242,1262 ----
  	$(RESMERGER) $(BINDIR)/$(PROJECT).rsrc -dstIs DF -o $(BUILT_PRODUCTS_DIR)/$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(PROJECT).rsrc
  	
! 	#
! 	# Extract info from Common/headers/versions.h for Info.plist file
! 	#
! 	
! 	$(CC) $(MAC_CFLAGS) -o $(SRCROOT)/tools/appversion.o $(SRCROOT)/tools/appversion.c
! 	$(CC) $(MAC_CFLAGS) -o $(SRCROOT)/tools/appcopyright.o $(SRCROOT)/tools/appcopyright.c
  
  	( \
  		product_str=$(PROJECT); \
  		\
! 		version_str=`$(SRCROOT)/tools/appversion.o`; \
! 		copyright_str=`$(SRCROOT)/tools/appcopyright.o`; \
  		\
! 		sed -e "s/\$${PRODUCT_NAME_STR}/$${product_str}/g" \
! 			-e "s/\$${PRODUCT_VERSION_STR}/$${version_str}/g" \
! 			-e "s/\$${PRODUCT_COPYRIGHT_STR}/$${copyright_str}/g" \
! 			$(SRCROOT)/Info.plist > $(BUILT_PRODUCTS_DIR)/$(CONTENTS_FOLDER_PATH)/Info.plist; \
  	)
  	
***************
*** 1286,1292 ****
  #
  clean:
! 	rm -f $(MAC_OBJECTS) $(WIN_OBJECTS)
  	rm -f $(BINDIR)/$(PROJECT).rsrc $(BINDIR)/$(PROJECT).res
  	rm -rf $(BINDIR)/$(PROJECT).app $(BINDIR)/$(PROJECT).exe
  
  installexes: $(EXES)
--- 1287,1294 ----
  #
  clean:
! 	rm -f $(MAC_OBJECTS) $(WIN_OBJECTS) $(MAC_INFOPLIST_OBJS)
  	rm -f $(BINDIR)/$(PROJECT).rsrc $(BINDIR)/$(PROJECT).res
  	rm -rf $(BINDIR)/$(PROJECT).app $(BINDIR)/$(PROJECT).exe
+ 	rm -f $(SRCROOT)/tools/appversion.o $(SRCROOT)/tools/appcopyright.o
  
  installexes: $(EXES)