From 2c4d561aa51cb03b6b41f20ec0626f961b8e92f7 Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Fri, 2 Dec 2016 11:30:20 -0500 Subject: [PATCH 1/3] Change Makefile for compatibility with OS X --- .gitmodules | 2 +- module => CMSIS | 0 Makefile | 6 ++---- 3 files changed, 3 insertions(+), 5 deletions(-) rename module => CMSIS (100%) diff --git a/.gitmodules b/.gitmodules index f0cc559..88f0084 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "ARM_CMSIS"] - path = module + path = CMSIS url = git@github.com:ARM-software/CMSIS.git diff --git a/module b/CMSIS similarity index 100% rename from module rename to CMSIS diff --git a/Makefile b/Makefile index 68e0680..d7d0a9e 100644 --- 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,8 +49,7 @@ 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 \ @@ -58,7 +57,6 @@ all: clean print_info --exclude=CMSIS/Utilities \ --exclude=CMSIS/DSP_Lib/Examples \ --exclude=Device/ARM/Documents \ - --exclude-vcs \ -cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)" $(MAKE) --no-builtin-rules postpackaging -C . @echo ---------------------------------------------------------- From 40ae5602e398c0b1f6d2b9241d2e65712432eca7 Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Fri, 2 Dec 2016 11:35:48 -0500 Subject: [PATCH 2/3] Change Github id in JSON template URL's --- extras/package_index.json.template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/package_index.json.template b/extras/package_index.json.template index 3d71207..0b3cfef 100644 --- 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%%" From 05530b742c413ff1ec6ed7950af8c2af40bb5829 Mon Sep 17 00:00:00 2001 From: Sandeep Mistry Date: Fri, 2 Dec 2016 11:45:09 -0500 Subject: [PATCH 3/3] Exclude .git from archive, as OS X doesn't support --exclude-vcs --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index d7d0a9e..76578f7 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,7 @@ all: clean print_info --exclude=CMSIS/Utilities \ --exclude=CMSIS/DSP_Lib/Examples \ --exclude=Device/ARM/Documents \ + --exclude=.git \ -cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)" $(MAKE) --no-builtin-rules postpackaging -C . @echo ----------------------------------------------------------