fix(mobile): make generate only local

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Aug 2, 2019 · 88e4ca0 · 88e4ca0
1 parent addb1eb
commit 88e4ca0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme b/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/adhoc.xcscheme
@@ -7,13 +7,13 @@
       buildImplicitDependencies = "YES">
       <PreActions>
          <ExecutionAction
-           ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
-           <ActionContent
-              title = "Run Script"
-              scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;echo &quot;.environment&quot; &gt; /tmp/envfile&#10;">
-           </ActionContent>
-        </ExecutionAction>
-     </PreActions>
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;echo &quot;.environment&quot; &gt; /tmp/envfile&#10;">
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"

diff --git a/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme b/client/ios/Berty.xcodeproj/xcshareddata/xcschemes/release.xcscheme
@@ -3,7 +3,7 @@
    LastUpgradeVersion = "0620"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "YES"
+      parallelizeBuildables = "NO"
       buildImplicitDependencies = "YES">
       <PreActions>
          <ExecutionAction

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/core/platform/mobile/Makefile b/core/platform/mobile/Makefile
@@ -64,17 +64,21 @@ deps-osx:
 
 .PHONY: deps
 deps: ios-deploy gomobile gobind
+	[ ! -z "$$CIRCLE_JOB" ] || (cd $(PWD)/../.. && make generate)
 
 .PHONY: gomobile
 gomobile: $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile
 
 .PHONY: gobind
 gobind: $(GOPATH)/src/golang.org/x/mobile/cmd/gobind
 
-$(GOPATH)/src/golang.org/x/mobile/cmd/%:
+$(GOPATH)/src/golang.org/x/mobile/cmd/gomobile $(GOPATH)/src/golang.org/x/mobile/cmd/gobind:
 	cd $(GOPATH)/src/golang.org/x/mobile && git checkout -- . || true
-	GO111MODULE=off go get -u $(patsubst $(GOPATH)/src/%,%,$@)
+	GO111MODULE=off go get -u $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile
+	GO111MODULE=off go get -u $(GOPATH)/src/golang.org/x/mobile/cmd/gobind
 	patch -N $(GOPATH)/src/golang.org/x/mobile/cmd/gomobile/env.go $(BUILD_PATCH_PATH)/gomobile-env-flag.diff || (rm -rf $(GOPATH)/src/golang.org/x/mobile && false)
+	cd $(GOPATH)/src/golang.org/x/mobile && GO111MODULE=off go install -v ./cmd/...
+	gomobile init -v
 
 ifeq ($(UNAME_S),Darwin)
 IOS_DEPLOY = $(shell which ios-deploy || echo '/usr/local/bin/ios-deploy')