* improved collection of localized resources

codeon-nat · codeon-nat · commit 569c360eb245 · 2019-10-22T12:28:02.000+02:00
* modernized the emitted CMakeLists.txt for mulle-objc 0.16
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.o
 build/
 Build/
+kitchen/
 xcuserdata/
 project.xcworkspace/
 mulle-xcode-settings.xcodeproj/nat.pbxuser
@@ -49,4 +50,4 @@ test/
 src/PBXSupport/
 mulle-project/
 generate-brew-formula.sh
-.mullex/
+.mullex/
diff --git a/.mulle/etc/craft/definition.mingw/set/CC b/.mulle/etc/craft/definition.mingw/set/CC
@@ -1 +1 @@
-mulle-clang
+mulle-clang-cl
diff --git a/.mulle/etc/project/formula-info.sh.sample b/.mulle/etc/project/formula-info.sh.sample
@@ -0,0 +1,14 @@
+# -- Formula Info --
+# If you don't have this file, there will be no homebrew
+# formula operations.
+#
+PROJECT="<|PROJECT_NAME|>"        # your project/repository name
+DESC="<|PROJECT_NAME|> is a project of sorts"
+LANGUAGE="<|PROJECT_LANGUAGE|>"  # c,cpp, objc, bash ...
+# NAME="${PROJECT}"        # formula filename without .rb extension
+
+# OS X brew dependencies, newline separated
+#DEPENDENCIES=''
+
+# Debian dependencies, comma separated
+#DEBIAN_DEPENDENCIES=""
diff --git a/.mulle/etc/project/post-release.sh.sample b/.mulle/etc/project/post-release.sh.sample
@@ -0,0 +1,9 @@
+# -- Post Release --
+# Push stuff into debian repository
+#
+
+post_release()
+{
+   exekutor mulle-project-debian
+}
+
diff --git a/.mulle/etc/project/publisher-info.sh b/.mulle/etc/project/publisher-info.sh
@@ -1,13 +1,3 @@
 PUBLISHER="mulle-nat"
 PUBLISHER_TAP="mulle-kybernetik/software"
 PUBLISHER_FULLNAME="Mulle kybernetiK"
-PUBLISHER_EMAIL="Nat! <nat@mulle-kybernetik.de>"
-PUBLISHER_DOMAIN="mulle-kybernetik.com"
-#PUBLISHER_LOGO="mulle-objc-logo-opaque-48x48.txt"
-PUBLISHER_LOGO="mulle-logo-48x48.txt"
-
-#
-# derivable stuff
-#
-PUBLISHER_PUBLICKEY_URL="http://www.${PUBLISHER_DOMAIN}/dists/admin-pub.asc"
-PUBLISHER_DEBIAN_URL="http://www.${PUBLISHER_DOMAIN}"
diff --git a/.mulle/etc/project/publisher-info.sh.sample b/.mulle/etc/project/publisher-info.sh.sample
@@ -0,0 +1,13 @@
+PUBLISHER="You"
+PUBLISHER_TAP="your_github_name/homebrew_repo"
+PUBLISHER_FULLNAME="You in detail"
+PUBLISHER_EMAIL="You <you@your.domain.tl>"
+PUBLISHER_DOMAIN="your.domain"
+
+#
+# derivable stuff for Debian
+# Which you will have to set up yourself
+# https://www.maxoberberger.net/blog/2013/05/creating-your-own-apt-repository.html
+#
+PUBLISHER_PUBLICKEY_URL="https://www.${PUBLISHER_DOMAIN}/dists/pubkey.asc"
+PUBLISHER_DEBIAN_URL="https://www.${PUBLISHER_DOMAIN}"
diff --git a/.mulle/etc/project/version b/.mulle/etc/project/version
@@ -1 +1 @@
-2.0.6
+2.1.0
diff --git a/.mulle/etc/sourcetree/config b/.mulle/etc/sourcetree/config
@@ -1,2 +1,2 @@
-Foundation;${FOUNDATION_NODETYPE:-tar};;a5ea764d-4f44-4e76-a6de-12b7ee5310b8;${FOUNDATION_URL:-https://github.com/MulleFoundation/Foundation/archive/${MULLE_BRANCH}.tar.gz};${FOUNDATION_BRANCH:-latest};;;
-Foundation-startup;none;no-all-load,no-build,no-cmakeinherit,no-delete,no-dependency,no-fs,no-import,no-share,no-update,only-startup;0F1D646D-A356-4CA6-9134-8B66DFD116D8;;;;;
+Foundation;${FOUNDATION_NODETYPE:-tar};no-singlephase;a5ea764d-4f44-4e76-a6de-12b7ee5310b8;${FOUNDATION_URL:-https://github.com/MulleFoundation/Foundation/archive/${MULLE_BRANCH}.tar.gz};${FOUNDATION_BRANCH:-latest};;;
+Foundation-startup;${FOUNDATION_STARTUP_NODETYPE:-tar};no-dynamic-link,no-header,no-import,no-intermediate-link;4A3ECF5B-83D4-4C76-A2E0-1177C5316A88;${FOUNDATION_STARTUP_URL:-https://github.com/MulleFoundation/Foundation-startup/archive/${MULLE_BRANCH}.tar.gz};${FOUNDATION_STARTUP_BRANCH:-latest};;;
diff --git a/.mulle/share/env/environment-extension.sh b/.mulle/share/env/environment-extension.sh
@@ -0,0 +1,6 @@
+#
+#
+#
+export PREFERRED_STARTUP_LIBRARY="Foundation-startup"
+
+
diff --git a/.mulle/share/env/environment-plugin.sh b/.mulle/share/env/environment-plugin.sh
@@ -37,10 +37,10 @@ export ADDICTION_DIR="${MULLE_VIRTUAL_ROOT}/addiction"
 #
 # Use common build directory
 #
-export BUILD_DIR="${MULLE_VIRTUAL_ROOT}/build"
+export KITCHEN_DIR="${MULLE_VIRTUAL_ROOT}/kitchen"
 #
 #
 #
-export MULLE_SDE_INSTALLED_VERSION="0.37.4"
+export MULLE_SDE_INSTALLED_VERSION="0.39.4"
 
 
diff --git a/.mulle/share/env/environment.sh b/.mulle/share/env/environment.sh
@@ -23,7 +23,7 @@ then
    MULLE_HOSTNAME="`PATH=/bin:/usr/bin:/sbin:/usr/sbin hostname -s`"
    if [ "${MULLE_HOSTNAME:0:1}" = '.' ]
    then
-      MULLE_HOSTNAME="_walitza"
+      MULLE_HOSTNAME="_${MULLE_HOSTNAME}"
    fi
    export MULLE_HOSTNAME
 fi
diff --git a/.mulle/share/env/tool-extension b/.mulle/share/env/tool-extension
@@ -11,3 +11,5 @@ ssh;optional
 tar;optional
 tty;optional
 zip;optional
+xz;optional
+bzip2;optional
diff --git a/.mulle/share/env/tool-plugin b/.mulle/share/env/tool-plugin
@@ -1,4 +1,6 @@
 
+autoconf;optional
+autoreconf;optional
 awk
 base64
 basename
diff --git a/.mulle/share/env/version b/.mulle/share/env/version
@@ -1 +1 @@
-2.3.0
+2.5.1
diff --git a/.mulle/share/sde/extension b/.mulle/share/sde/extension
@@ -1,3 +1,3 @@
-foundation/legacy-developer;meta
-foundation/legacy;runtime
+foundation/objc-porter;meta
+foundation/objc-base;runtime
 mulle-sde/mulle-project;extra
diff --git a/.mulle/share/sde/version/foundation/legacy b/.mulle/share/sde/version/foundation/legacy
diff --git a/.mulle/share/sde/version/foundation/legacy-developer b/.mulle/share/sde/version/foundation/legacy-developer
diff --git a/.mulle/share/sde/version/foundation/objc-base b/.mulle/share/sde/version/foundation/objc-base
@@ -0,0 +1 @@
+0.16.0
diff --git a/.mulle/share/sde/version/foundation/objc-porter b/.mulle/share/sde/version/foundation/objc-porter
@@ -0,0 +1 @@
+0.16.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,6 +9,8 @@ cmake_minimum_required (VERSION 3.4)
 
 # check if compiling with mulle-sde
 
+set( FIND_FOUNDATION_LIBRARY ON) # default
+
 if( NOT DEPENDENCY_DIR)
    set( DEPENDENCY_DIR "${PROJECT_SOURCE_DIR}/dependency")
 endif()
@@ -37,16 +39,27 @@ if( EXISTS "${DEPENDENCY_DIR}")
    ${CMAKE_LIBRARY_PATH}
    )
 
-   execute_process( COMMAND mulle-sde linkorder --output-format cmake --output-omit Foundation
-                    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
+
+   set( FIND_FOUNDATION_LIBRARY OFF) # default
+
+   execute_process( COMMAND mulle-sde stash-dir
+                    OUTPUT_VARIABLE MULLE_SOURCETREE_STASH_DIR)
+   string( STRIP "${MULLE_SOURCETREE_STASH_DIR}" MULLE_SOURCETREE_STASH_DIR)
+
+
+   execute_process( COMMAND mulle-sde linkorder --stash-dir "${MULLE_SOURCETREE_STASH_DIR}" --startup --simplify --output-format cmake
                     OUTPUT_VARIABLE MULLE_SDE_LINKER_FLAGS
+                    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
                     RESULT_VARIABLE RVAL)
    if( NOT ${RVAL} EQUAL 0)
       message( FATAL_ERROR "Failed to procure linkorder from mulle-sde. Old version ?")
    endif()
 
    message( STATUS "MULLE_SDE_LINKER_FLAGS=\"${MULLE_SDE_LINKER_FLAGS}\"")
-
+   set( MULLE_SDE_LINKER_FLAGS
+        ${MULLE_SDE_LINKER_FLAGS}
+        CACHE INTERNAL "cache this for posterity"
+   )
 else()
    message( STATUS "Not a mulle-sde build (\"${DEPENDENCY_DIR}\" does not exist)")
 endif()
@@ -55,7 +68,9 @@ endif()
 # Platform specific definitions
 #
 option( GNUSTEP "Use GNUstep instead of mulle-objc" OFF)
-
+if( GNUSTEP)
+   set( FIND_FOUNDATION_LIBRARY OFF) # default
+endif()
 
 if( APPLE)
    # # CMAKE_OSX_SYSROOT must be set for CMAKE_OSX_DEPLOYMENT_TARGET (cmake bug)
@@ -101,13 +116,14 @@ set( MULLE_XCODE_TO_CMAKE_STATIC_DEPENDENCIES
 ${MULLEPBX_LIBRARY}
 )
 
-if( NOT GNUSTEP)
-    find_library( FOUNDATION_LIBRARY Foundation)
-    message( STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}")
-else()
+if( FIND_FOUNDATION_LIBRARY)
+   find_library( FOUNDATION_LIBRARY Foundation)
+   message( STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}")
+endif()
 
+if( GNUSTEP)
 	# Without this, execute_process() does not work under GNUstep shell on Windows
-	# =>  	objc_def_flags and objc_def_link_flags are empty 
+	# =>  	objc_def_flags and objc_def_link_flags are empty
 	# =>	RESULT_VARIABLE contains "%1 is not a valid win32 app"
 	if(WIN32)
 		set(EXECUTE_PROCESS_PRECOMMAND "sh")
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ installed and then build **mulle-xcode-to-cmake** with:
 
 ```
 mulle-sde clean cache
-mulle-sde craft
+mulle-sde craft --release
 mulle-sde run mulle-make install --prefix /usr/local/bin
 ```
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,3 +1,12 @@
+## 0.9.0
+
+* improved collection of localized resources
+* modernized the emitted CMakeLists.txt for mulle-objc 0.16
+* fix mulle-sde project
+* update README install instructions
+* fix incorrect group relative paths
+
+
 ### 0.8.1
 
 * fix mulle-sde project
diff --git a/mulle-xcode-to-cmake.xcodeproj/project.pbxproj b/mulle-xcode-to-cmake.xcodeproj/project.pbxproj
@@ -352,7 +352,7 @@
 		1DEB927908733DD40010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 0.8.1;
+				CURRENT_PROJECT_VERSION = 0.9.0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";
@@ -373,7 +373,7 @@
 		1DEB927A08733DD40010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 0.8.1;
+				CURRENT_PROJECT_VERSION = 0.9.0;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = "$(CURRENT_PROJECT_VERSION)";
 				DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";
diff --git a/src/PBXReading/MullePBXUnarchiver.m b/src/PBXReading/MullePBXUnarchiver.m
diff --git a/src/PBXReading/PBXObject.m b/src/PBXReading/PBXObject.m
diff --git a/src/mulle-xcode-to-cmake/NSString+ExternalName.h b/src/mulle-xcode-to-cmake/NSString+ExternalName.h
diff --git a/src/mulle-xcode-to-cmake/NSString+ExternalName.m b/src/mulle-xcode-to-cmake/NSString+ExternalName.m
diff --git a/src/mulle-xcode-to-cmake/main.m b/src/mulle-xcode-to-cmake/main.m

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +#
 +#
 +#
 +export PREFERRED_STARTUP_LIBRARY="Foundation-startup"
++
++
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ export ADDICTION_DIR="${MULLE_VIRTUAL_ROOT}/addiction"`
`37`	`37`	`#`
`38`	`38`	`# Use common build directory`
`39`	`39`	`#`
`40`		`-export BUILD_DIR="${MULLE_VIRTUAL_ROOT}/build"`
	`40`	`+export KITCHEN_DIR="${MULLE_VIRTUAL_ROOT}/kitchen"`
`41`	`41`	`#`
`42`	`42`	`#`
`43`	`43`	`#`
`44`		`-export MULLE_SDE_INSTALLED_VERSION="0.37.4"`
	`44`	`+export MULLE_SDE_INSTALLED_VERSION="0.39.4"`
`45`	`45`
`46`	`46`