Index: .gitignore
==================================================================
--- .gitignore
+++ .gitignore
@@ -21,11 +21,11 @@
extra.mk
generators/gen_tables
generators/gen_tables.exe
generators/CaseFolding.txt
generators/UnicodeData.txt
-objfw-config
+Info.plist
ObjFW.xcodeproj/*.mode1v3
ObjFW.xcodeproj/*.pbxuser
ObjFW.xcodeproj/project.xcworkspace
ObjFW.xcodeproj/xcuserdata
src/objfw-defs.h
@@ -32,5 +32,6 @@
src/ObjFW
tests/tests
tests/tests.exe
tests/EBOOT.PBP
tests/PARAM.SFO
+utils/objfw-config
DELETED Info.plist
Index: Info.plist
==================================================================
--- Info.plist
+++ Info.plist
@@ -1,24 +0,0 @@
-
-
-
-
- CFBundleDevelopmentRegion
- English
- CFBundleExecutable
- ObjFW
- CFBundleName
- ObjFW
- CFBundleIdentifier
- org.webkeks.objfw
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundlePackageType
- FMWK
- CFBundleSignature
- OBJFW
- CFBundleVersion
- 0.7-dev
- CFBundleShortVersionString
- 0.7-dev
-
-
ADDED Info.plist.in
Index: Info.plist.in
==================================================================
--- Info.plist.in
+++ Info.plist.in
@@ -0,0 +1,22 @@
+
+
+
+
+ CFBundleExecutable
+ ObjFW
+ CFBundleName
+ ObjFW
+ CFBundleIdentifier
+ org.webkeks.objfw
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundlePackageType
+ FMWK
+ CFBundleSignature
+ OBJFW
+ CFBundleVersion
+ @PACKAGE_VERSION@
+ CFBundleShortVersionString
+ @PACKAGE_VERSION@
+
+
Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -10,29 +10,16 @@
extra.mk
include buildsys.mk
tarball:
- V=$$(fgrep VERSION= utils/objfw-config.in | \
- sed 's/VERSION="\(.*\)"/\1/'); \
- V2=$$(fgrep AC_INIT configure.ac | \
- sed 's/AC_INIT([^,]*,\([^,]*\),.*/\1/' | sed 's/ //'); \
- V3=$$(fgrep -A1 CFBundleVersion Info.plist | tail -1 | \
- sed 's/.*>\(.*\)<.*/\1/'); \
- V4=$$(fgrep -A1 CFBundleShortVersion Info.plist | tail -1 | \
- sed 's/.*>\(.*\)<.*/\1/'); \
- if test x"$$V2" != x"$$V" \
- -o x"$$V3" != x"$$V" \
- -o x"$$V4" != x"$$V4"; then \
- echo "Not all files have the same version number!"; \
- echo "Files: util/objfw-config.in configure.ac Info.plist"; \
- exit 1; \
- fi; \
- echo "Generating tarball for version $$V..."; \
- rm -fr objfw-$$V objfw-$$V.tar objfw-$$V.tar.gz; \
- git archive HEAD --prefix objfw-$$V/ -o objfw-$$V.tar && \
- tar xf objfw-$$V.tar && \
- rm -f objfw-$$V.tar objfw-$$V/.gitignore && \
- cp configure config.h.in objfw-$$V/ && \
- tar cf objfw-$$V.tar objfw-$$V && \
- gzip -9 objfw-$$V.tar; \
- rm -fr objfw-$$V objfw-$$V.tar
+ echo "Generating tarball for version ${PACKAGE_VERSION}..."
+ rm -fr tmp.tar objfw-${PACKAGE_VERSION} objfw-${PACKAGE_VERSION}.tar \
+ objfw-${PACKAGE_VERSION}.tar.gz
+ git archive HEAD --prefix objfw-${PACKAGE_VERSION}/ -o tmp.tar
+ tar xf tmp.tar
+ rm -f tmp.tar objfw-${PACKAGE_VERSION}/.gitignore
+ cp configure config.h.in objfw-${PACKAGE_VERSION}/
+ tar cf objfw-${PACKAGE_VERSION}.tar objfw-${PACKAGE_VERSION}
+ rm -fr objfw-${PACKAGE_VERSION}
+ gzip -9 objfw-${PACKAGE_VERSION}.tar
+ rm -f objfw-${PACKAGE_VERSION}.tar
Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -680,8 +680,8 @@
dnl and add OBJCPPFLAGS to CPPFLAGS, thus we need to AC_SUBST these ourself.
AC_SUBST(CPP)
AC_SUBST(CPPFLAGS)
AC_SUBST(PACKAGE, ObjFW)
-AC_CONFIG_FILES([buildsys.mk extra.mk utils/objfw-config])
+AC_CONFIG_FILES([buildsys.mk extra.mk utils/objfw-config Info.plist])
AC_CONFIG_HEADERS([config.h src/objfw-defs.h])
AC_OUTPUT
Index: utils/objfw-config.in
==================================================================
--- utils/objfw-config.in
+++ utils/objfw-config.in
@@ -35,11 +35,11 @@
LIBS="-L${libdir} -lobjfw @LIBS@"
PLUGIN_CFLAGS="@PLUGIN_CFLAGS@"
PLUGIN_LDFLAGS="@PLUGIN_LDFLAGS@"
PLUGIN_SUFFIX="@PLUGIN_SUFFIX@"
PROG_SUFFIX="@EXEEXT@"
-VERSION="0.7-dev"
+VERSION="@PACKAGE_VERSION@"
show_help() {
cat <<__EOF__
objfw-config: Available arguments are: