Skip to content

Change Makefile for compatibility with OS X #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 2, 2016
Merged

Change Makefile for compatibility with OS X #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c4d561
Change Makefile for compatibility with OS X
sandeepmistry Dec 2, 2016
40ae560
Change Github id in JSON template URL's
sandeepmistry Dec 2, 2016
05530b7
Exclude .git from archive, as OS X doesn't support --exclude-vcs
sandeepmistry Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "ARM_CMSIS"]
path = module
path = CMSIS
url = git@github.com:ARM-software/CMSIS.git
0 module → CMSIS
Open in desktop
Submodule CMSIS updated from 000000 to 8c0e1a
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from tar manpage I see:

     --exclude-vcs
           exclude version control system directories

shall we add something like --exclude=.git?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion, I'll push a change for this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--exclude-vcs is by essence --exclude=.git but not only ;-)
at least it was doing that when I wrote this makefile

$(MAKE) --no-builtin-rules postpackaging -C .
@echo ----------------------------------------------------------
Expand Down
12 changes: 6 additions & 6 deletions extras/package_index.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%%"
Expand Down