Skip to content

Commit 54b1a52

Browse files
committed
* fix mulle-sde project
* update README install instructions * fix incorrect group relative paths
1 parent fd2fb7e commit 54b1a52

File tree

5 files changed

+42
-13
lines changed

5 files changed

+42
-13
lines changed

.mulle/etc/sourcetree/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Foundation;tar;;70DEE2C1-F25E-422F-8C9A-4F16409162AD;Foundation;${FOUNDATION_BRANCH:-latest};;;
1+
Foundation;${FOUNDATION_NODETYPE:-tar};;a5ea764d-4f44-4e76-a6de-12b7ee5310b8;${FOUNDATION_URL:-https://github.com/MulleFoundation/Foundation/archive/${MULLE_BRANCH}.tar.gz};${FOUNDATION_BRANCH:-latest};;;
22
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;;;;;

README.md

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ It can convert most targets, but it will do better with libraries and tools or
1010
frameworks.
1111

1212
> This is useful for "one-shot" conversions. For continous conversions from
13-
> Xcode to cmake, the author prefers to use
14-
> [mulle-match](https://github.com/mulle-sde/mulle-match) together with
15-
> [mulle-match-to-cmake](https://github.com/mulle-sde/mulle-match/blob/release/mulle-match-to-cmake)
16-
> nowadays.
13+
> Xcode to cmake, use [mulle-sde](https://github.com/mulle-sde/mulle-sde).
14+
1715

1816
Fork | Build Status | Master Version
1917
----------|---------------|-----------------------------------
@@ -22,16 +20,32 @@ Fork | Build Status | Master Version
2220

2321
## Install
2422

23+
24+
### MacOS : Apple
25+
2526
Use the [homebrew](//brew.sh) package manager to install it, or build
2627
it yourself with Xcode:
2728

2829
```
2930
brew install mulle-kybernetik/software/mulle-xcode-to-cmake
3031
```
3132

32-
It is also possible to build using **cmake** and the "CMakeLists.txt" file
33-
generated by mulle-xcode-to-cmake itself. After checking out the sources,
34-
change into the source directory and then
33+
### MacOS / Linux / FreeBSD : mulle-objc
34+
35+
Get [foundation-developer](//github.com/MulleFoundation/foundation-developer)
36+
installed and then build **mulle-xcode-to-cmake** with:
37+
38+
```
39+
mulle-sde clean cache
40+
mulle-sde craft
41+
mulle-sde run mulle-make install --prefix /usr/local/bin
42+
```
43+
44+
### Windows / Linux : GNUstep
45+
46+
It is also possible to build with GNUstep using **cmake** and the
47+
`CMakeLists.txt` file generated by **mulle-xcode-to-cmake** itself. After
48+
checking out the sources, change into the source directory and then:
3549

3650
```
3751
mkdir build && cd build
@@ -42,8 +56,8 @@ sudo make install
4256

4357
On Mac this should work without installing any additional dependencies. On other
4458
platforms it is suggested to install a recent clang version (5 or later) and you
45-
will need libobjc and the gnustep-base developer package, both from GNUstep (or another
46-
implementation of the ObjC runtime and the Foundation library).
59+
will need libobjc and the gnustep-base developer package, both from GNUstep
60+
(or another implementation of the ObjC runtime and the Foundation library).
4761

4862
On Windows, it is a bit tricky : please refer to this little guide [here](https://github.com/ElMostafaIdrassi/mulle-xcode-to-cmake/blob/release/BUILD-GNUSTEP-WINDOWS.md)
4963

RELEASENOTES.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
### 0.8.1
2+
3+
* fix mulle-sde project
4+
* update README install instructions
5+
* fix incorrect group relative paths
6+
17
## 0.8.0
28

39
* add a couple of suggestions and fix ideas by @saxbophone

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
1DEB927908733DD40010E9CD /* Debug */ = {
353353
isa = XCBuildConfiguration;
354354
buildSettings = {
355-
CURRENT_PROJECT_VERSION = 0.8.0;
355+
CURRENT_PROJECT_VERSION = 0.8.1;
356356
DEBUG_INFORMATION_FORMAT = dwarf;
357357
DYLIB_COMPATIBILITY_VERSION = "$(CURRENT_PROJECT_VERSION)";
358358
DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";
@@ -373,7 +373,7 @@
373373
1DEB927A08733DD40010E9CD /* Release */ = {
374374
isa = XCBuildConfiguration;
375375
buildSettings = {
376-
CURRENT_PROJECT_VERSION = 0.8.0;
376+
CURRENT_PROJECT_VERSION = 0.8.1;
377377
DEBUG_INFORMATION_FORMAT = dwarf;
378378
DYLIB_COMPATIBILITY_VERSION = "$(CURRENT_PROJECT_VERSION)";
379379
DYLIB_CURRENT_VERSION = "${CURRENT_PROJECT_VERSION}";

src/mulle-xcode-to-cmake/PBXPathObject+HierarchyAndPaths.m

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@ - (BOOL) isInSourceTreeAndAbsolute
7272
}
7373

7474

75+
- (BOOL) isSourceRoot
76+
{
77+
NSString *tree;
78+
79+
tree = [self sourceTree];
80+
return( [tree isEqualToString:@"SOURCE_ROOT"]);
81+
}
82+
83+
7584
- (BOOL) isGroupRelative
7685
{
7786
NSString *tree;
@@ -226,7 +235,7 @@ - (NSArray *) _sourceTreeRelativeFilesystemPathComponents
226235
NSString *path;
227236
PBXGroup *dad;
228237

229-
if( ! [self isGroupRelative])
238+
if( ! [self isGroupRelative] && ! [self isSourceRoot])
230239
return( nil);
231240

232241
dad = [self parentGroup];

0 commit comments

Comments
 (0)