Skip to content

Commit

Permalink
Fix up .gitignore, remove generated files
Browse files Browse the repository at this point in the history
Some generated Makefiles and extconf.h files were committed to the
repository in error. These have been removed and the `.gitignore`
file now has more liberal patterns to catch them going forward.

```
$ git status # done from app/gui/qt
On branch mac-osx-high-sierra-exp
Your branch is up to date with 'origin/mac-osx-high-sierra-exp'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   ../../server/ruby/vendor/atomic/ext/Makefile
	modified:   ../../server/ruby/vendor/fast_osc-0.0.12/ext/fast_osc/Makefile
	modified:   ../../server/ruby/vendor/ffi-1.9.17/ext/ffi_c/Makefile
	modified:   ../../server/ruby/vendor/ffi-1.9.17/ext/ffi_c/extconf.h
	modified:   ../../server/ruby/vendor/ruby-coreaudio-0.0.12/ext/coreaudio/Makefile

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	../../server/ruby/vendor/rugged-0.26.0/ext/rugged/Makefile
	../../server/ruby/vendor/rugged-0.26.0/vendor/libgit2/build/

no changes added to commit (use "git add" and/or "git commit -a")
```
  • Loading branch information
obscurerichard committed Sep 11, 2018
1 parent 94f7c6d commit 2dbb67e
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 1,086 deletions.
24 changes: 7 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ app/gui/qt/qrc__*
*.DS_Store
*.log
*.swp
*.tmp
\.#*
.lein-plugins
*~
Expand All @@ -89,22 +90,13 @@ app/gui/qt/qrc__*
# Native

app/server/native/
app/server/vendor/ffi/ext/
app/server/vendor/ffi-1.9.10/ext/ffi_c/Makefile
app/server/vendor/ffi-1.9.10/ext/ffi_c/extconf.h
app/server/vendor/*/ext

app/server/rb-native/

## Rugged

app/server/vendor/rugged*/ext/rugged/Makefile
app/server/vendor/rugged*/vendor/libgit2/build

## Atomic

app/server/vendor/atomic/ext/Makefile

# Patterns like this catch both
# app/server/vendor/ffi/ext/ and app/server/ruby/vendor/ffi/ext/
# (the latter is found in the Mac OS X build)
**/vendor/*/ext/**/Makefile
**/vendor/ffi-*/ext/ffi_c/extconf.h
**/vendor/**/build/

## Book

Expand All @@ -118,5 +110,3 @@ book/

etc/doc/lang/sonic-pi-tutorial.pot
etc/doc/generated/
app/server/vendor/ffi-1.9.17/ext/ffi_c/extconf.h
app/server/vendor/ffi-1.9.17/ext/ffi_c/Makefile
264 changes: 0 additions & 264 deletions app/server/ruby/vendor/atomic/ext/Makefile

This file was deleted.

Loading

0 comments on commit 2dbb67e

Please sign in to comment.