Skip to content

Commit 0fee2e4

Browse files
committed
Improve generated reminders, update to newer mulle-bootstrap ways.
1 parent 7fef94f commit 0fee2e4

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,15 @@ This is basically a stripped down version of `mulle_xcode_utility`.
233233

234234
### Releasenotes
235235

236+
##### 0.6.1
237+
238+
* improve sexport reminder
239+
236240
##### 0.6.0
237241

238242
* there is a new option `-2`. It generates a `CMakeLists.txt` that includes
239243
a file called `CMakeSourcesAndHeaders.txt`. This is a file that you can generate
240-
with a second run of `mulle-xcode-to-cmake` using `sexport`.
244+
with an additional run of `mulle-xcode-to-cmake sexport`.
241245

242246
##### 0.5.4
243247

mulle-xcode-to-cmake.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
1DEB927908733DD40010E9CD /* Debug */ = {
368368
isa = XCBuildConfiguration;
369369
buildSettings = {
370-
CURRENT_PROJECT_VERSION = 0.6.0;
370+
CURRENT_PROJECT_VERSION = 0.6.1;
371371
DEBUG_INFORMATION_FORMAT = dwarf;
372372
DYLIB_COMPATIBILITY_VERSION = "$(CURRENT_PROJECT_VERSION)";
373373
DYLIB_CURRENT_VERSION = 0.0.0;
@@ -388,7 +388,7 @@
388388
1DEB927A08733DD40010E9CD /* Release */ = {
389389
isa = XCBuildConfiguration;
390390
buildSettings = {
391-
CURRENT_PROJECT_VERSION = 0.6.0;
391+
CURRENT_PROJECT_VERSION = 0.6.1;
392392
DEBUG_INFORMATION_FORMAT = dwarf;
393393
DYLIB_COMPATIBILITY_VERSION = "$(CURRENT_PROJECT_VERSION)";
394394
DYLIB_CURRENT_VERSION = 0.0.0;

src/mulle-xcode-to-cmake/main.m

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,9 @@ static void print_mulle_configuration( void)
368368
"# mulle-configuration environment\n"
369369
"#\n"
370370
"# How to install:\n"
371-
"# mulle-bootstrap settings -g -a embedded_repositories 'https://github.com/mulle-nat/mulle-configuration'\n"
372-
"# mulle-bootstrap\n"
371+
"# mulle-bootstrap settings -g -a embedded_repositories '${MULLE_REPOSITORIES}/mulle-configuration;;${MULLE_CONFIGURATION_BRANCH:-release}'\n"
372+
"# mulle-bootstrap expansion -g MULLE_REPOSITORIES 'https://github.com/mulle-nat'\n"
373+
"# mulle-bootstrap\n"
373374
"\n"
374375
"set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/mulle-configuration)\n");
375376

@@ -1216,8 +1217,8 @@ static void exporter( PBXProject *root,
12161217
printf( "# Generated on %d-%d-%d %d:%02d:%02d by version %s of mulle-xcode-to-cmake\n",
12171218
tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec,
12181219
stringify( CURRENT_PROJECT_VERSION));
1219-
printf( "# Commandline arguments:\n"
1220-
"# %s\n\n", [s UTF8String]);
1220+
printf( "# Command line:\n"
1221+
"# mulle-xcode-to-cmake %s\n\n", [s UTF8String]);
12211222
}
12221223
}
12231224

@@ -1243,8 +1244,16 @@ static void exporter( PBXProject *root,
12431244

12441245
if( twoStageCMakeLists && cmd == Export)
12451246
{
1246-
printf( "\n# produce CMakeSourcesAndHeaders.txt with `mulle-xcode-to-cmake sexport`\n"
1247-
"\ninclude( CMakeSourcesAndHeaders.txt)\n");
1247+
printf( "\n##\n"
1248+
"## Produce CMakeSourcesAndHeaders.txt with:\n");
1249+
printf( "## mulle-xcode-to-cmake");
1250+
rover = [targets objectEnumerator];
1251+
while( pbxtarget = [rover nextObject])
1252+
printf( " -t '%s'", [[pbxtarget name] UTF8String]);
1253+
printf( " sexport > CMakeSourcesAndHeaders.txt\n"
1254+
"##\n"
1255+
"\n"
1256+
"include( CMakeSourcesAndHeaders.txt)\n");
12481257
}
12491258
else
12501259
{

0 commit comments

Comments
 (0)