From 283eac7e5fe5a01dea1b0c3bf6efc0bd70b84e84 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Tue, 1 Dec 2015 21:00:32 +0100 Subject: IOS: Create a separate for adding resources --- devtools/create_project/xcode.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index 2686d14986..366ee803c2 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -40,6 +40,8 @@ protected: void createOtherBuildFiles(const BuildSetup &setup); + void addResourceFiles(const BuildSetup &setup, StringList &includeList, StringList &excludeList); + void createProjectFile(const std::string &name, const std::string &uuid, const BuildSetup &setup, const std::string &moduleDir, const StringList &includeList, const StringList &excludeList); -- cgit v1.2.3 From b58ec8f15ac1710af7353626bc488495bfb9e868 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Tue, 1 Dec 2015 21:25:36 +0100 Subject: IOS: Fixes various iOS compilation flags, and missing frameworks --- devtools/create_project/xcode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index 366ee803c2..a5f0fc1cf0 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -314,12 +314,12 @@ private: // Setup objects void setupCopyFilesBuildPhase(); - void setupFrameworksBuildPhase(); + void setupFrameworksBuildPhase(const BuildSetup &setup); void setupNativeTarget(); void setupProject(); void setupResourcesBuildPhase(); void setupSourcesBuildPhase(); - void setupBuildConfiguration(); + void setupBuildConfiguration(const BuildSetup &setup); // Misc void setupDefines(const BuildSetup &setup); // Setup the list of defines to be used on build configurations -- cgit v1.2.3 From 2bffce5e72b679f187554bfc00398d7666b3a948 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 2 Dec 2015 11:46:25 +0100 Subject: IOS: Adds the image asset catalog to the iOS targer --- devtools/create_project/xcode.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index a5f0fc1cf0..a4aedb0fac 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -244,6 +244,15 @@ private: objectMap[obj->id] = true; } + Object *find(std::string id) { + for (std::vector::iterator it = objects.begin(); it != objects.end(); ++it) { + if ((*it)->id == id) { + return *it; + } + } + return NULL; + } + std::string toString() { std::string output; @@ -320,6 +329,8 @@ private: void setupResourcesBuildPhase(); void setupSourcesBuildPhase(); void setupBuildConfiguration(const BuildSetup &setup); + void setupImageAssetCatalog(const BuildSetup &setup); + void addAdditionalSources(std::string targetName, Property &files, int &order); // Misc void setupDefines(const BuildSetup &setup); // Setup the list of defines to be used on build configurations -- cgit v1.2.3 From ef2903c50972fedc45aba5749a6ce238d0d723a3 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 2 Dec 2015 14:02:13 +0100 Subject: IOS : Rename a function --- devtools/create_project/xcode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index a4aedb0fac..08cc8c2618 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -330,7 +330,7 @@ private: void setupSourcesBuildPhase(); void setupBuildConfiguration(const BuildSetup &setup); void setupImageAssetCatalog(const BuildSetup &setup); - void addAdditionalSources(std::string targetName, Property &files, int &order); + void setupAdditionalSources(std::string targetName, Property &files, int &order); // Misc void setupDefines(const BuildSetup &setup); // Setup the list of defines to be used on build configurations -- cgit v1.2.3 From 433808b7dc1ba624a2b65558f7f1da921c19d316 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 2 Dec 2015 14:44:10 +0100 Subject: IOS: Properly adds the resource files to the targets --- devtools/create_project/xcode.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index 08cc8c2618..c4cb035b98 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -335,6 +335,9 @@ private: // Misc void setupDefines(const BuildSetup &setup); // Setup the list of defines to be used on build configurations + // Retrieve information + ValueList& getResourceFiles() const; + // Hash generation std::string getHash(std::string key); std::string newHash() const; -- cgit v1.2.3 From ee73bb428f6f23b921e8c832778b0225618c35b8 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 9 Dec 2015 15:32:52 +0100 Subject: IOS: Compute MD5 identifiers instead of random To avoid recompiling the wole project each time we use the create_project tool. --- devtools/create_project/xcode.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index c4cb035b98..c97e31064b 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -340,6 +340,9 @@ private: // Hash generation std::string getHash(std::string key); +#ifdef MACOSX + std::string md5(std::string key); +#endif std::string newHash() const; // Output -- cgit v1.2.3 From 4687ff6d6d2863cc95c8137543ecf9c39bc01723 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 6 Jan 2016 15:11:40 +0100 Subject: DEVTOOL: Cleanup --- devtools/create_project/xcode.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index 698b02e651..ab9be96eb1 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -65,7 +65,7 @@ private: std::string _sourceTree; FileProperty(std::string fileType = "", std::string name = "", std::string path = "", std::string source = "") - : _fileEncoding(""), _lastKnownFileType(fileType), _fileName(name), _filePath(path), _sourceTree(source) { + : _fileEncoding(""), _lastKnownFileType(fileType), _fileName(name), _filePath(path), _sourceTree(source) { } }; @@ -152,7 +152,7 @@ private: struct Object { public: std::string _id; // Unique identifier for this object - std::string _name; // Name (may not be unique - for ex. configuration entries) + std::string _name; // Name (may not be unique - for ex. configuration entries) std::string _refType; // Type of object this references (if any) std::string _comment; // Main comment (empty for no comment) @@ -210,6 +210,7 @@ private: assert(!_properties["isa"]._settings.empty()); SettingList::iterator it = _properties["isa"]._settings.begin(); + return it->first; } }; @@ -233,8 +234,8 @@ private: } Object *find(std::string id) { - for (std::vector::iterator it = objects.begin(); it != objects.end(); ++it) { - if ((*it)->id == id) { + for (std::vector::iterator it = _objects.begin(); it != _objects.end(); ++it) { + if ((*it)->_id == id) { return *it; } } -- cgit v1.2.3 From c7e65e60dd9bf8042a5eb5fd65d838c412b2e7b9 Mon Sep 17 00:00:00 2001 From: Vincent Bénony Date: Wed, 6 Jan 2016 11:39:53 +0100 Subject: DEVTOOL: Formatting --- devtools/create_project/xcode.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'devtools/create_project/xcode.h') diff --git a/devtools/create_project/xcode.h b/devtools/create_project/xcode.h index ab9be96eb1..d495dd0dfd 100644 --- a/devtools/create_project/xcode.h +++ b/devtools/create_project/xcode.h @@ -152,7 +152,7 @@ private: struct Object { public: std::string _id; // Unique identifier for this object - std::string _name; // Name (may not be unique - for ex. configuration entries) + std::string _name; // Name (may not be unique - for ex. configuration entries) std::string _refType; // Type of object this references (if any) std::string _comment; // Main comment (empty for no comment) -- cgit v1.2.3