Merge pull request #1 from sandeepmistry/osx

Change Makefile for compatibility with OS X
stm32duino · Dec 2, 2016 · a061a91 · a061a91
2 parents 5962df2 + 05530b7
commit a061a91
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ARM_CMSIS"]
-	path = module
+	path = CMSIS
 	url = [email protected]:ARM-software/CMSIS.git
diff --git a/module → CMSIS b/module → CMSIS
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ PACKAGE_VERSION := 4.5.0
 
 # -----------------------------------------------------------------------------
 # packaging specific
-PACKAGE_FOLDER := module
+PACKAGE_FOLDER := CMSIS
 
 ifeq (postpackaging,$(findstring $(MAKECMDGOALS),postpackaging))
   PACKAGE_FILENAME=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2
@@ -49,16 +49,15 @@ endif
 all: clean print_info
 	@echo ----------------------------------------------------------
 	@echo "Packaging module."
-	tar --transform "s|module|$(PACKAGE_NAME)-$(PACKAGE_VERSION)|g" \
-		--exclude=./.gitattributes \
+	tar --exclude=./.gitattributes \
 		--exclude=./.travis.yml \
 		--exclude=CMSIS/index.html \
 		--exclude=CMSIS/Documentation \
 		--exclude=CMSIS/Pack \
 		--exclude=CMSIS/Utilities \
 		--exclude=CMSIS/DSP_Lib/Examples \
 		--exclude=Device/ARM/Documents \
-		--exclude-vcs \
+		--exclude=.git \
 		-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)"
 	$(MAKE) --no-builtin-rules postpackaging -C .
 	@echo ----------------------------------------------------------

diff --git a/extras/package_index.json.template b/extras/package_index.json.template
@@ -5,42 +5,42 @@
           [
             {
               "host": "i686-mingw32",
-              "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
+              "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
               "archiveFileName": "%%FILENAME%%",
               "checksum": "SHA-256:%%CHECKSUM%%",
               "size": "%%SIZE%%"
             },
             {
               "host": "x86_64-apple-darwin",
-              "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
+              "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
               "archiveFileName": "%%FILENAME%%",
               "checksum": "SHA-256:%%CHECKSUM%%",
               "size": "%%SIZE%%"
             },
             {
               "host": "x86_64-pc-linux-gnu",
-              "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
+              "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
               "archiveFileName": "%%FILENAME%%",
               "checksum": "SHA-256:%%CHECKSUM%%",
               "size": "%%SIZE%%"
             },
             {
               "host": "i686-pc-linux-gnu",
-              "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
+              "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
               "archiveFileName": "%%FILENAME%%",
               "checksum": "SHA-256:%%CHECKSUM%%",
               "size": "%%SIZE%%"
             },
             {
               "host": "arm-linux-gnueabihf",
-              "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
+              "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
               "archiveFileName": "%%FILENAME%%",
               "checksum": "SHA-256:%%CHECKSUM%%",
               "size": "%%SIZE%%"
             },
             {
               "host": "all",
-              "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
+              "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
               "archiveFileName": "%%FILENAME%%",
               "checksum": "SHA-256:%%CHECKSUM%%",
               "size": "%%SIZE%%"