Commita061a91

authored

Merge pull request#1 from sandeepmistry/osx

Change Makefile for compatibility with OS X

2 parents5962df2 +05530b7 commita061a91Copy full SHA for a061a91

File tree

4 files changed

+10

-11

lines changed

4 files changed

+10

-11

lines changed

`‎.gitmodules`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`[submodule "ARM_CMSIS"]`
`2`		`-path=module`
	`2`	`+path=CMSIS`
`3`	`3`	`url=git@github.com:ARM-software/CMSIS.git`

`‎modulerenamed to‎CMSIS`

SubmoduleCMSIS updatedfrom 0000000 to 8c0e1a9

`‎Makefile`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ PACKAGE_VERSION := 4.5.0`
`30`	`30`
`31`	`31`	`# -----------------------------------------------------------------------------`
`32`	`32`	`# packaging specific`
`33`		`-PACKAGE_FOLDER :=module`
	`33`	`+PACKAGE_FOLDER :=CMSIS`
`34`	`34`
`35`	`35`	`ifeq (postpackaging,$(findstring$(MAKECMDGOALS),postpackaging))`
`36`	`36`	`PACKAGE_FILENAME=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2`
`@@ -49,16 +49,15 @@ endif`
`49`	`49`	`all: clean print_info`
`50`	`50`	`@echo ----------------------------------------------------------`
`51`	`51`	`@echo"Packaging module."`
`52`		`-tar --transform"s\|module\|$(PACKAGE_NAME)-$(PACKAGE_VERSION)\|g"\`
`53`		`---exclude=./.gitattributes\`
	`52`	`+tar --exclude=./.gitattributes\`
`54`	`53`	`--exclude=./.travis.yml\`
`55`	`54`	`--exclude=CMSIS/index.html\`
`56`	`55`	`--exclude=CMSIS/Documentation\`
`57`	`56`	`--exclude=CMSIS/Pack\`
`58`	`57`	`--exclude=CMSIS/Utilities\`
`59`	`58`	`--exclude=CMSIS/DSP_Lib/Examples\`
`60`	`59`	`--exclude=Device/ARM/Documents\`
`61`		`---exclude-vcs\`
	`60`	`+--exclude=.git\`
`62`	`61`	`-cjf"$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2""$(PACKAGE_FOLDER)"`
`63`	`62`	`$(MAKE) --no-builtin-rules postpackaging -C.`
`64`	`63`	`@echo ----------------------------------------------------------`

`‎extras/package_index.json.template`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,42 +5,42 @@`
`5`	`5`	`[`
`6`	`6`	`{`
`7`	`7`	`"host": "i686-mingw32",`
`8`		`- "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
	`8`	`+ "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
`9`	`9`	`"archiveFileName": "%%FILENAME%%",`
`10`	`10`	`"checksum": "SHA-256:%%CHECKSUM%%",`
`11`	`11`	`"size": "%%SIZE%%"`
`12`	`12`	`},`
`13`	`13`	`{`
`14`	`14`	`"host": "x86_64-apple-darwin",`
`15`		`- "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
	`15`	`+ "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
`16`	`16`	`"archiveFileName": "%%FILENAME%%",`
`17`	`17`	`"checksum": "SHA-256:%%CHECKSUM%%",`
`18`	`18`	`"size": "%%SIZE%%"`
`19`	`19`	`},`
`20`	`20`	`{`
`21`	`21`	`"host": "x86_64-pc-linux-gnu",`
`22`		`- "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
	`22`	`+ "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
`23`	`23`	`"archiveFileName": "%%FILENAME%%",`
`24`	`24`	`"checksum": "SHA-256:%%CHECKSUM%%",`
`25`	`25`	`"size": "%%SIZE%%"`
`26`	`26`	`},`
`27`	`27`	`{`
`28`	`28`	`"host": "i686-pc-linux-gnu",`
`29`		`- "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
	`29`	`+ "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
`30`	`30`	`"archiveFileName": "%%FILENAME%%",`
`31`	`31`	`"checksum": "SHA-256:%%CHECKSUM%%",`
`32`	`32`	`"size": "%%SIZE%%"`
`33`	`33`	`},`
`34`	`34`	`{`
`35`	`35`	`"host": "arm-linux-gnueabihf",`
`36`		`- "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
	`36`	`+ "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
`37`	`37`	`"archiveFileName": "%%FILENAME%%",`
`38`	`38`	`"checksum": "SHA-256:%%CHECKSUM%%",`
`39`	`39`	`"size": "%%SIZE%%"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`	`42`	`"host": "all",`
`43`		`- "url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
	`43`	`+ "url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",`
`44`	`44`	`"archiveFileName": "%%FILENAME%%",`
`45`	`45`	`"checksum": "SHA-256:%%CHECKSUM%%",`
`46`	`46`	`"size": "%%SIZE%%"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita061a91

File tree

4 files changed

4 files changed

`‎.gitmodules`

`‎modulerenamed to‎CMSIS`

`‎Makefile`

`‎extras/package_index.json.template`

0 commit comments