Skip to content

Commit

Permalink
avoid using recursive delete with wildcards
Browse files Browse the repository at this point in the history
  • Loading branch information
diakopter committed Jul 15, 2013
1 parent 01460a5 commit e1de106
Show file tree
Hide file tree
Showing 4 changed files with 596 additions and 325 deletions.
65 changes: 0 additions & 65 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,65 +0,0 @@
# Editor backups
*~
*.bak

# Generated files
Makefile
3rdparty/apr/LibR/
3rdparty/apr/.libs/
3rdparty/apr/.make.dirs
3rdparty/apr/Release/
3rdparty/apr/build/
3rdparty/apr/include/apr.h
3rdparty/apr/test/
3rdparty/apr/x64/
3rdparty/apr/apr-1-config
3rdparty/apr/apr-config.out
3rdparty/apr/apr.exp
3rdparty/apr/apr.pc
3rdparty/apr/apr.spec
3rdparty/apr/config.log
3rdparty/apr/config.nice
3rdparty/apr/config.status
3rdparty/apr/export_vars.c
3rdparty/apr/exports.c
3rdparty/apr/include/arch/unix/apr_private.h
3rdparty/apr/include/arch/unix/apr_private.h.in~
3rdparty/apr/libtool
3rdparty/libatomic_ops/autom4te.cache/
3rdparty/libatomic_ops/config.log
3rdparty/libatomic_ops/config.status
3rdparty/libatomic_ops/pkgconfig/atomic_ops-uninstalled.pc
3rdparty/libatomic_ops/pkgconfig/atomic_ops.pc
3rdparty/libatomic_ops/src/.deps/
3rdparty/libatomic_ops/src/config.h
3rdparty/libatomic_ops/src/libatomic_ops.a
3rdparty/libatomic_ops/src/stamp-h1
3rdparty/libatomic_ops/tests/.deps/
3rdparty/libatomic_ops/tests/list_atomic.i
src/gen/
*.la
*.obj
*.exe
*.o
*.pdb
*.suo
*.ilk
*.lo
*.so
moarvm
nqp-cc/*.moarvm
nqp-cc/temp.output
nqp-cc/*.mvmdump
nqp-cc/*.mastdump
*.vsp
*.psess
/nmake.cmd
UNIDATA/*
/src/strings/unicode.c
*.class
tags

3rdparty/dyncall/ConfigVars
3rdparty/dyncall/dyncall/libdyncall_s.*
3rdparty/dyncall/dyncallback/libdyncallback_s.*
3rdparty/dyncall/dynload/libdynload_s.*
4 changes: 2 additions & 2 deletions build/Config/BuildEnvironment.pm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ my %BUILDDEF = (
# Filename conventions
exe => '',
o => '.o',
libext => '.a',
dotlib => '.a',
dirslash => '/',
outtonull => '/dev/null',
dontecho => '',
Expand Down Expand Up @@ -38,7 +38,7 @@ my %BUILDDEF = (
# Filename conventions
exe => '.exe',
o => '.obj',
libext => '.lib',
dotlib => '.lib',
dirslash => '\\',
outtonull => 'NUL',
dontecho => '@',
Expand Down
2 changes: 1 addition & 1 deletion build/Config/dyncall.pm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ sub configure {
if ($make eq 'nmake') {
system_or_die('@cd 3rdparty\dyncall && Configure.bat >NUL 2>NUL' . (`cl 2>&1` =~ /x64/ ? ' /target-x64' : ''));
return (%config,
dyncall_build => 'cd 3rdparty\dyncall && $(MAKE) -F Nmakefile'
dyncall_build => 'cd 3rdparty\dyncall && nmake /F Nmakefile'
);
}
else {
Expand Down
Loading

0 comments on commit e1de106

Please sign in to comment.