Fix TestApp Makefile (readium#7)

d-i-t-a · Nov 9, 2021 · b4a9358 · b4a9358
1 parent b05597a
commit b4a9358
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Support/Carthage/project-as-submodule.yml b/Support/Carthage/project-as-submodule.yml
@@ -91,7 +91,7 @@ targets:
       - framework: Fuzi.framework
       - framework: Minizip.framework
       - framework: SQLite.framework
-      - framework: ZIPFoundation..framework
+      - framework: ZIPFoundation.framework
       - target: R2Shared
     settings:
       PRODUCT_BUNDLE_IDENTIFIER: org.readium.readium-lcp-swift

diff --git a/TestApp/Makefile b/TestApp/Makefile
@@ -1,4 +1,4 @@
-version = `git describe --tags --match [0-9]* --abbrev=0 2> /dev/null`
+version = `git describe --tags --abbrev=0 2> /dev/null`
 ifdef commit
 	version = $(commit)
 endif
@@ -32,9 +32,9 @@ else
 	@cp Integrations/SPM/project.yml .
 endif
 ifdef commit
-	@sed -i "" -e "s>VERSION>revision: $(version)>g" project.yml
+	@sed -i "" -e "s>VERSION>revision: $(commit)>g" project.yml
 else
-	@sed -i "" -e "s>VERSION>from: $(commit)>g" project.yml
+	@sed -i "" -e "s>VERSION>from: $(version)>g" project.yml
 endif
 	xcodegen generate
 	@echo "\nopen TestApp.xcodeproj"