issue/2871 - Fix the framework copy and codesigining issues by flovilmart · Pull Request #2873 · CocoaPods/CocoaPods

flovilmart · 2014-11-25T01:14:42Z

Forget the other one... that one is cleaner!

Never compare that to banana-lib!

Choose a label for the target definition which contains whitespaces.

As it breaks the migration

Embed frameworks with a run script build phase

Fix indentation

mrackwitz · 2014-11-25T15:34:59Z

Could you keep the blank lines in the generated script?

mrackwitz · 2014-11-25T15:47:29Z

Nice that you came up with a solution for both problems! 👍

- Adds back removed blanklines - declare source and destination as local - respect code style for if statements - quoted variables for paths - Adds exclude *.h files on rsync - code_sign now requires a full path

flovilmart · 2014-11-25T16:00:06Z

Not a really big contribution, but a useful one :)

flovilmart · 2014-11-25T16:00:49Z

The test fails when checking the generated .sh file for an OS X project. where's the template that we match against?

flovilmart · 2014-11-25T18:48:11Z

It appears to be more exclusions compared to the Xcode current copy framework phase:

The original command is
builtin-copy -exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -exclude Headers -exclude PrivateHeaders -strip-debug-symbols -strip-tool /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip -resolve-src-symlinks

ValCapri · 2014-11-25T19:01:27Z

I tested with your latest commit with "Fixes for mrackwitz" in my own fork (which was CocoaPods/swift branch, after that I rebased against master) and it's working. Beta distribution through Fabric.io works.
So thank you.

mrackwitz · 2014-11-25T19:03:38Z

@flovilmart: The spec to match against is in a separate submodule, which you can rebuild with rake spec:rebuilt_integration_fixtures from the main project.

flovilmart · 2014-11-25T19:27:13Z

@mrackwitz do you want me to update the spec and PR?

mrackwitz · 2014-11-25T19:43:42Z

@flovilmart: Do you want to try to incorporate the further exclusion parameters, which you figured out?
(-exclude .DS_Store -exclude CVS -exclude .svn -exclude .git -exclude .hg -exclude Headers -exclude PrivateHeaders, where the last both would then be preferably used instead of -exclude '*.h')
If you want, I can then take over and take your changes into the 'swift' branch. So you don't need to rebuild and fork the integration-spec submodule. The changes there have to rebased again anyway, so a merge makes that always a bit more of hassle.

flovilmart · 2014-11-25T19:45:27Z

@mrackwitz I'll add the additional excludes, and properly test that archived/built FW are still functional.
I'll replace the current -exclude '*.h' with the Xcode proposed ones

flovilmart · 2014-11-25T20:26:17Z

I've integrated the exclusion patterns with rsync with the --filter param, maybe a bit verbose but that works, it properly skips all specified folders. --exclude requires the file to exist so it can be excluded, which is pretty weird...

segiddins · 2014-12-06T00:07:17Z

@mrackwitz this was just manually merged, no? In which case, we can close the PR

mrackwitz · 2014-12-06T00:07:28Z

I rebased now your branch and fast-forwarded it into the rebased swift branch.

flovilmart · 2014-12-06T00:08:26Z

Awesome!

On Fri, Dec 5, 2014 at 7:07 PM, Marius Rackwitz notifications@github.com
wrote:

Closed #2873.

Reply to this email directly or view it on GitHub:
#2873 (comment)

kylef and others added 30 commits November 22, 2014 18:01

Add support for swift source files

e022428

[Doc] Add group for better separation

c881670

[Doc] Add some method-inline comments

efdae74

[Spec][Fixtures] Add a Swift podspec fixture

451e403

Never compare that to banana-lib!

Add methods to check if a target uses swift

0511dc3

Support framework as type for generated target

10be3a9

Integrate product_refs of generated frameworks

3f57561

Migrate from static library to framework

f66a52a

Set headers as public if needed in PodTargetInstaller

c8588cd

Generate an Info.plist for frameworks

53f7fa7

Add Swift specific settings to the generated xcconfig files if required

f051b27

[Spec] Change label of target definition in spec for AggregateTarget

f57a8a7

Choose a label for the target definition which contains whitespaces.

Add target type specific settings to XCConfigs

99d9cea

[Refactor] Extracted product_basename from Target's product name getters

f6d84b6

Add helper method Target#c99ext_identifier

9ffeedc

Ensure that the PRODUCT_NAME is a C99ext identifier

08996c9

Don't use #product_basename for the different product type getters

e867f4b

As it breaks the migration

Link the target product according to its type

c298f45

Make attribute :imports of Generator::Header writeable

82b2c9e

Support module imports in header files

b09f5be

Add Pod::Generator::UmbrellaHeader

cf7e061

Add TargetInstaller#create_umbrella_header

ab58162

Ensure the output dir exists in Generator::Header#save_as

324fe28

[Spec] Don't mock additional configurations here

149665f

[Refactor] TargetIntegrator#native_targets_to_integrate

6eef896

Explicitly disable initial code signing for OS X framework targets

5274335

[Refactor] Extract #generate_target from Analyzer#generate_targets

11fc24f

[Refactor] Extract #generate_pod_targets in Analyzer

ff81745

[Refactor] Extract #generate_pod_target in Analyzer

5af9c04

Add the Embed Pods Framework Build Phase in TargetIntegrator

7ce890a

Embed frameworks with a run script build phase

Fix the framework copy and codesigining issues

f3fe8e7

Fix indentation

flovilmart force-pushed the issue/2871-nice branch from 409c945 to f3fe8e7 Compare November 25, 2014 01:29

mrackwitz mentioned this pull request Nov 25, 2014

Support for Frameworks / Swift #2835

Merged

15 tasks

mrackwitz reviewed Nov 25, 2014
View reviewed changes

Fixes for @mrackwitz

cd89542

- Adds back removed blanklines - declare source and destination as local - respect code style for if statements - quoted variables for paths - Adds exclude *.h files on rsync - code_sign now requires a full path

orta mentioned this pull request Nov 25, 2014

@ashfurrow => Cp 36 artsy/eidolon#329

Merged

flovilmart mentioned this pull request Nov 25, 2014

[Frameworks] Wrong specified location of integrated Pods Product Reference causes linker warning #2877

Closed

Updates exclude list on rsync to match Xcode Copy Frameworks strategy

5e1d160

orta mentioned this pull request Dec 2, 2014

Distribute to AppStore Moya/Moya#88

Closed

mrackwitz force-pushed the swift branch from 99364e6 to a4ced5c Compare December 5, 2014 20:30

mrackwitz closed this Dec 6, 2014

Uh oh!

Conversation

flovilmart commented Nov 25, 2014

Uh oh!

mrackwitz Nov 25, 2014

Choose a reason for hiding this comment

Uh oh!

mrackwitz commented Nov 25, 2014

Uh oh!

flovilmart commented Nov 25, 2014

Uh oh!

flovilmart commented Nov 25, 2014

Uh oh!

flovilmart commented Nov 25, 2014

Uh oh!

ValCapri commented Nov 25, 2014

Uh oh!

mrackwitz commented Nov 25, 2014

Uh oh!

flovilmart commented Nov 25, 2014

Uh oh!

mrackwitz commented Nov 25, 2014

Uh oh!

flovilmart commented Nov 25, 2014

Uh oh!

flovilmart commented Nov 25, 2014

Uh oh!

segiddins commented Dec 6, 2014

Uh oh!

mrackwitz commented Dec 6, 2014

Uh oh!

flovilmart commented Dec 6, 2014

Closed #2873.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants