Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

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.

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

Already on GitHub?Sign in to your account

Merged
cmaglie merged 3 commits intoarduino:masterfromsandeepmistry:osx
Dec 2, 2016
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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 numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
[submodule "ARM_CMSIS"]
path =module
path =CMSIS
url = git@github.com:ARM-software/CMSIS.git
7 changes: 3 additions & 4 deletionsMakefile
View file
Open in desktop
Original file line numberDiff line numberDiff 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
ContributorAuthor

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 deletionsextras/package_index.json.template
View file
Open in desktop
Original file line numberDiff line numberDiff 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
[8]ページ先頭
©2009-2025 Movatter.jp