Remove symlinks to shared/gui from app folders :D.

.github/workflows/main.yml

@@ -3,6 +3,23 @@ on: [push]
 jobs:
 
 
+
+  build-flt-orc:
+    runs-on: macos-latest
+
+    steps:
+
+    - uses: actions/checkout@v2
+    - name: env/setup
+      run: env/setup.sh
+    - name: git submodule
+      run: env/submodule.sh --jobs 3
+
+    - name: make skeleton
+      run: ./app-flutter.sh orchid && cd app-flutter && make
+
+
+
   build-ios-app:
     runs-on: macos-latest
 
@@ -135,7 +152,7 @@ jobs:
       run: env/submodule.sh --jobs 3
 
     - name: setup plugins
-      run: debug=crossndk make -j3 -C app-windows shared/gui/.flutter-plugins
+      run: debug=crossndk make -j3 -C app-windows ./env/dotdot/gui-orchid/.flutter-plugins
     - name: make Windows app
       run: make -j3 -C app-windows target=win precache='--no-android --no-ios --windows -a'
     - uses: actions/upload-artifact@v1
@@ -204,7 +221,7 @@ jobs:
       run: env/submodule.sh --jobs 3
 
     - name: setup plugins
-      run: debug=crossndk make -j3 -C app-linux shared/gui/.flutter-plugins
+      run: debug=crossndk make -j3 -C app-linux ./env/dotdot/gui-orchid/.flutter-plugins
     - name: make Linux app
       run: debug=crossndk make -j3 -C app-linux precache='--no-android --no-ios --linux'
     - uses: actions/upload-artifact@v1

app-android/build.gradle

@@ -27,7 +27,7 @@ subprojects {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
-def flutter = files(flutterJar)
+def flutter = files(orcFlutter)
 
 android {
     compileSdkVersion 29
@@ -47,6 +47,7 @@ android {
 
     sourceSets {
         main {
+            java.srcDirs += [orcInterface + "/android/app/src/main/java"]
             assets.srcDirs += ['out-and/assets']
             jniLibs.srcDirs = ['out-and/jnilibs']
         }
@@ -66,7 +67,7 @@ android {
 }
 
 import groovy.json.JsonSlurper
-def plugins = new JsonSlurper().parseText(new File("shared/gui/.flutter-plugins-dependencies").text)
+def plugins = new JsonSlurper().parseText(new File(orcInterface + "/.flutter-plugins-dependencies").text)
 plugins.plugins.android.each { dependency ->
     def plugin = project.rootProject.findProject(":${dependency.name}")
 

app-android/makefile

@@ -54,19 +54,19 @@ $(output)/assets/flutter_assets/AssetManifest%json: $(output)/flutter/flutter_as
 	@mkdir -p $(dir $@)
 	rsync -a --delete $(dir $<) $(dir $@)
 
-flutter/bin/cache/artifacts/engine/android-%-release/flutter.jar: flutter/packages/flutter/pubspec.lock
+$(pwd/flutter)/bin/cache/artifacts/engine/android-%-release/flutter.jar: $(pwd/flutter)/packages/flutter/pubspec.lock
 	@
 
 temp := $(foreach arch,$(jni),$(foreach base,orchid flutter app,$(output)/jnilibs/$(arch)/lib$(base).so))
 
-$(output)/jnilibs/%/libflutter.so: flutter/bin/cache/artifacts/engine/android-$$(flutter/$$*)-release/flutter.jar
+$(output)/jnilibs/%/libflutter.so: $(pwd/flutter)/bin/cache/artifacts/engine/android-$$(flutter/$$*)-release/flutter.jar
 	@mkdir -p $(dir $@)
 	unzip -p $< lib/$*/libflutter.so >$@
 
-$(apk): $(shell find src/main/kotlin -name '*.kt') $(shell find src/main/java -name '*.java') $(shell find src/main/res) build.gradle src/main/AndroidManifest.xml $(temp) $(subst %,.,$(generated)) $(output)/assets/flutter_assets/AssetManifest.json flutter/bin/cache/artifacts/engine/android-arm-release/flutter.jar
+$(apk): $(shell find src/main/kotlin -name '*.kt') $(shell find src/main/java -name '*.java') $(shell find src/main/res) build.gradle src/main/AndroidManifest.xml $(temp) $(subst %,.,$(generated)) $(output)/assets/flutter_assets/AssetManifest.json $(pwd/flutter)/bin/cache/artifacts/engine/android-arm-release/flutter.jar
 	@gradle -Pandroid.debug.obsoleteApi=true assembleRelease --console verbose --warning-mode all \
 	    -PorcMonotonic='$(monotonic)' -PorcRevision='$(revision)' -PorcPackage='$(package)' -PorcVersion='$(version)' \
-	    -PflutterJar=flutter/bin/cache/artifacts/engine/android-arm-release/flutter.jar
+	    -PorcFlutter=$(pwd/flutter)/bin/cache/artifacts/engine/android-arm-release/flutter.jar -PorcInterface='$(pwd/gui)'
 	exit 0
 	touch $@
 

app-android/settings.gradle

@@ -1,7 +1,7 @@
 def root = rootProject.projectDir.toPath()
 
 def plugins = new Properties()
-def file = new File(root.toFile(), '.flutter-plugins')
+def file = new File(root.toFile(), orcInterface + "/.flutter-plugins")
 if (file.exists()) {
     file.withReader('UTF-8') { reader -> plugins.load(reader) }
 }

app-flutter.mk

@@ -18,20 +18,36 @@
 # }}}
 
 
+.PHONY: all
+all: 
+
 include ../env/common.mk
+pwd/gui := ./gui
+$(call include,shared/target-all.mk)
 
-.PHONY: all
-all: ios
+$(foreach fork,$(forks),$(shell ln -sf $(patsubst %/pubspec.yaml,%,$(fork)) >/dev/null))
+
+.PHONY: create
+create: $(pwd/flutter)/packages/flutter/pubspec.lock
+	$(flutter) create -i objc -a java --no-pub --project-name orchid .
+
+builds := 
+builds += apk
+builds += macos
+builds += ios
 
-include shared/target-all.mk
+define all
+.PHONY: $(1)
+$(1): $$(forks) $$(dart)
+	$$(flutter) build $(1) $(if $(filter $(1),ios),|| true)
+all: $(1)
+endef
 
-.PHONY: ios
-ios: $(forks)
-	flutter/bin/flutter build ios
+$(foreach build,$(builds),$(eval $(call all,$(build))))
 
 .PHONY: test
 test: $(forks)
-	flutter/bin/flutter run
+	$(flutter) run
 
 .PHONY: run
 run:

app-flutter.sh

@@ -6,20 +6,11 @@ mkdir app-flutter
 cd app-flutter
 
 ln -s ../app-shared shared
-ln -s shared/flutter
-ln -s shared/gui/in_app_purchase
-
-ln -s shared/gui/pubspec.yaml
-ln -s shared/gui/lib
-ln -s shared/gui/assets
-
 ln -s ../app-flutter.mk makefile
+ln -s ../gui-"$1" gui
 
-flutter=flutter/bin/flutter
-
-"${flutter}" create -i objc -a java --no-pub --project-name orchid .
-rm -f README.md
+ln -s gui/pubspec.yaml
+ln -s gui/lib
+ln -s gui/assets
 
-"${flutter}" build apk
-"${flutter}" build macos
-"${flutter}" build ios
+make create

app-ios/makefile

@@ -67,7 +67,6 @@ local :=
 local += app.mm.o
 
 local += $(subst %,.,$(generated)).o
-$(call depend,ios/Runner/GeneratedPluginRegistrant.m.o,ios/Pods/Manifest.lock)
 
 include env/output.mk
 
@@ -77,11 +76,6 @@ endef
 $(each)
 
 
-cflags += -Fflutter/bin/cache/artifacts/engine/ios
-lflags += -Fflutter/bin/cache/artifacts/engine/ios
-
-
-
 ifneq ($(target),sim)
 $(bundle)/PlugIns/$(name).VPN.appex/$(name).VPN: $(patsubst %,$(output)/$(default)/%,$(object) $(linked))
 	@mkdir -p $(dir $@)

app-macos/makefile

@@ -76,7 +76,7 @@ $(output)/%.swift.o: $$(specific) $$(folder).swift $$(code) $(swifts)
 	$(specific)
 	@mkdir -p $(dir $@)
 	@echo [CC] $(target)/$(arch) $<
-	swift -frontend -sdk $(isysroot) -c -o $@ -primary-file $< $(filter-out ./$<,$(swifts)) -module-name $(name) -Fmacos/Flutter/ephemeral/.symlinks/flutter/darwin-x64 $(foreach pod,$(wildcard $(output)/Release/*/*.framework),-F$(dir $(pod)))
+	swift -frontend -sdk $(isysroot) -c -o $@ -primary-file $< $(filter-out ./$<,$(swifts)) -module-name $(name) -F$(pwd/gui)/macos/Flutter/ephemeral/.symlinks/flutter/darwin-x64 $(foreach pod,$(wildcard $(output)/Release/*/*.framework),-F$(dir $(pod)))
 	@touch $@
 
 define _