Refactor Makefile to build a unique XPI per arch

Author: willdurand

.gitignore

@@ -1 +1 @@
-*.xpi
+dist/

Makefile

@@ -1,60 +1,44 @@
 ARCHS=linux linux64 mac64 win32
 
 EXTENSION_NAME=adb-extension
-VERSION=0.0.6pre
-XPI_NAME=$(EXTENSION_NAME)-$(VERSION)
+# Please keep only three parts in the value of this `VERSION` variable.
+# `build-xpis` below will automatically add a forth part.
+VERSION=0.0.7
 
 ROOT_PATH=pub/labs/devtools/$(EXTENSION_NAME)
 ROOT_UPDATE_URL=https://ftp.mozilla.org/$(ROOT_PATH)
-S3_BASE_URL=s3://net-mozaws-prod-delivery-contrib/$(ROOT_PATH)
 
 define build-xpis
 	pushd extension; \
+	index=0; \
 	for arch in $(ARCHS); do \
+		xpi_name=$(EXTENSION_NAME)-$(VERSION).$$index; \
+		echo "[release-$$arch] Create dist/$$arch/ folder"; \
+		mkdir -p ../dist/$$arch; \
 		echo "[release-$$arch] Create manifest.json"; \
 		sed \
+			-e "s#@@ARCH@@#$$arch#" \
 			-e "s#@@UPDATE_URL@@#$(ROOT_UPDATE_URL)/$$arch/update.json#" \
-			-e "s#@@VERSION@@#$(VERSION)#" \
+			-e "s#@@VERSION@@#$(VERSION).$$index#" \
 			template-manifest.json > manifest.json; \
-		echo "[release-$$arch] ZIP to $(XPI_NAME)-$$arch.xpi"; \
-		zip ../dist/$(XPI_NAME)-$$arch.xpi -r $$arch adb.json manifest.json; \
+		echo "[release-$$arch] ZIP to $$xpi_name-$$arch.xpi"; \
+		zip ../dist/$$arch/$$xpi_name-$$arch.xpi -r $$arch adb.json manifest.json; \
 		echo "[release-$$arch] Delete temporary manifest.json"; \
 		rm manifest.json; \
+		echo "[release-$$arch] Create update.json"; \
+		sed \
+			-e "s#@@UPDATE_LINK@@#$(ROOT_UPDATE_URL)/$$arch/$$xpi_name-$$arch.xpi#" \
+			-e "s#@@VERSION@@#$(VERSION).$$index#" \
+			../template-update.json > ../dist/$$arch/update.json; \
+		index=$$((index + 1)); \
 	done; \
 	popd
 endef
 
 define clean
-	echo "Remove previous xpi files"; \
-	rm -f **/*.xpi
-endef
-
-define release
-	pushd dist; \
 	for arch in $(ARCHS); do \
-		echo "[release-$$arch] Sign .xpi"; \
-		../sign.sh $(XPI_NAME)-$$arch.xpi; \
-		echo "[release-$$arch] Upload .xpi"; \
-		aws s3 cp \
-			$(XPI_NAME)-$$arch.xpi \
-			$(S3_BASE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi; \
-		echo "[release-$$arch] Copy to 'latest' .xpi"; \
-		aws s3 cp \
-			$(S3_BASE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi \
-			$(S3_BASE_URL)/$$arch/adb-extension-latest-$$arch.xpi; \
-		echo "[release-$$arch] Create update.json"; \
-		sed \
-			-e "s#@@UPDATE_LINK@@#$(ROOT_UPDATE_URL)/$$arch/$(XPI_NAME)-$$arch.xpi#" \
-			-e "s#@@VERSION@@#$(VERSION)#" \
-			../template-update.json > update.json; \
-		echo "[release-$$arch] Upload update.json"; \
-		aws s3 cp --cache-control max-age=3600 \
-			update.json \
-			$(S3_BASE_URL)/$$arch/update.json; \
-		echo "[release-$$arch] Delete temporary update.json"; \
-		rm update.json; \
-	done; \
-	popd
+		rm -rf dist/$$arch/; \
+	done
 endef
 
 package:
@@ -63,6 +47,3 @@ package:
 
 clean:
 	@$(call clean)
-
-release:
-	@$(call release)

README.md

@@ -5,7 +5,27 @@ It provides ADB binaries used by DevTools to connect to Firefox/GeckoView produc
 
 ### Releases
 
-For documentation about releases check out [RELEASE.md](./RELEASE.md)
+1. Update the value of the `VERSION` variable in the `Makefile` (and commit the change)
+2. Run `make package`. The following files should have been generated in the `dist/` folder:
+
+    ```
+    dist
+    ├── linux
+    │   ├── adb-extension-0.0.7.0-linux.xpi
+    │   └── update.json
+    ├── linux64
+    │   ├── adb-extension-0.0.7.1-linux64.xpi
+    │   └── update.json
+    ├── mac64
+    │   ├── adb-extension-0.0.7.2-mac64.xpi
+    │   └── update.json
+    └── win32
+        ├── adb-extension-0.0.7.3-win32.xpi
+        └── update.json
+    ```
+
+3. Upload the different XPI files to AMO (as unlisted versions). Download the signed XPI files.
+4. Upload the signed XPI files and their `update.json` files to the FTP server.  Note that we'll want to upload the versioned XPIs (e.g. `adb-extension-0.0.7.3-win32.xpi`) as well as "latest" copies (e.g. `adb-extension-latest-win32.xpi`).
 
 ### Discussion
 

RELEASE.md

@@ -1,17 +1,17 @@
 {
   "manifest_version": 2,
   "name": "Firefox DevTools ADB Extension",
-  "author": "Mozilla & Android Open Source Project",
   "version": "@@VERSION@@",
-  "description": "An extension providing ADB binaries for Android remote debugging in Firefox DevTools. May be automatically installed when using about:debugging.",
-  "applications": {
+  "description": "An extension providing (@@ARCH@@) ADB binaries for Android remote debugging in Firefox DevTools. May be automatically installed when using about:debugging.",
+  "browser_specific_settings": {
     "gecko": {
       "id": "adb@mozilla.org",
       "strict_min_version": "64.0a1",
       "update_url": "@@UPDATE_URL@@"
     }
   },
-  "permissions": [
-  ],
-  "homepage_url": "https://github.com/mozilla/devtools-adb-extension"
+  "developer": {
+    "name": "Mozilla & Android Open Source Project",
+    "url": "https://github.com/mozilla-extensions/devtools-adb-extension"
+  }
 }