Commit Diff

Commit:
5468ba37446a85bfb8a84eed74bf6c091156f682
From:
Alexander Barton <alex@barton.de>
Date:
Message:
Xcode: get release number dynamically; new make target "xcode-clean". - make target "xcode" now detects the release number stored in the configure.in file and passes it to Xcode. - new make target "xcode-clean" which removes all files generated by "make xcode" and removes the Xcode build directory.
Actions:
Patch | Tree
commit - eb159e0a8d38449c10680cf3ed747fdb5c5adbc8
commit + 5468ba37446a85bfb8a84eed74bf6c091156f682
blob - 701bf6b4d1481973ad68c95f506ad3a84cbdc6f7
blob + 0fd06222848b5bda97a73117ee0e363beaec6633
--- Makefile.am
+++ Makefile.am
@@ -32,12 +32,21 @@ lint:
 srcdoc:
 	make -C doc srcdoc
 
-xcode:
+have-xcodebuild:
 	@xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -list \
 	 >/dev/null 2>&1 \
 	 || ( echo; echo "Error: \"xcodebuild\" not found!"; echo; exit 1 )
+
+xcode: have-xcodebuild
+	rel=`grep AC_INIT configure.in | cut -d' ' -f2 | cut -d')' -f1`; \
+	 def="GCC_PREPROCESSOR_DEFINITIONS=\"VERSION=\\\"$$rel\\\"\""; \
+	 xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \
+	 -configuration Default $$def build
+
+xcode-clean: have-xcodebuild
 	xcodebuild -project contrib/MacOSX/ngIRCd.xcodeproj -alltargets \
-	 -buildstyle Development
+	 -configuration Default clean
+	rm -fr contrib/MacOSX/build
 
 rpm: distcheck
 	rpm -ta ngircd-*.tar.gz
@@ -46,7 +55,7 @@ deb:
 	[ -f debian/rules ] || ln -s contrib/Debian debian
 	dpkg-buildpackage -rfakeroot -i
 
-osxpkg:
+osxpkg: have-xcodebuild
 	@packagemaker >/dev/null 2>&1; [ $$? -ge 1 ] \
 	 || ( echo; echo "Error: \"packagemaker\" not found!"; echo; exit 2)
 	make clean
blob - 0b5a141b4ff5a6a52661279b0190945a57ac3a67
blob + 9fd2dfcf6ef62c53965b6b51002a54e4e59091c9
--- contrib/MacOSX/config.h
+++ contrib/MacOSX/config.h
@@ -12,7 +12,9 @@
  */
 
 #define PACKAGE_NAME "ngircd"
+#ifndef VERSION
 #define VERSION "??"
+#endif
 #define SYSCONFDIR "/etc/ngircd"
 
 #ifndef TARGET_VENDOR