You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/07/21 13:42:17 UTC
[1/2] git commit: Manual cleanup of some MSVC .obj files
Repository: lucy-clownfish
Updated Branches:
refs/heads/master bd045a8af -> 7baa94b7e
Manual cleanup of some MSVC .obj files
When compiling an .exe directly from source files, MSVC creates object
files in the current directory which makes it hard to create cleanup
rules automatically.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/b27af5b2
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/b27af5b2
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/b27af5b2
Branch: refs/heads/master
Commit: b27af5b2f341392b41d4db86f94555d155ff4cdc
Parents: bd045a8
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Jul 21 13:30:32 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Jul 21 13:40:49 2014 +0200
----------------------------------------------------------------------
compiler/common/charmonizer.c | 4 ++++
compiler/common/charmonizer.main | 4 ++++
compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm | 4 ++++
runtime/common/charmonizer.c | 4 ++++
runtime/common/charmonizer.main | 4 ++++
5 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b27af5b2/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index a76ca8a..8a667db 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -7245,6 +7245,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
chaz_MakeRule_add_recursive_rm_command(clean_rule, "coverage");
}
+ if (chaz_Probe_msvc_version_num()) {
+ chaz_MakeRule_add_rm_command(clean_rule, "lemon.obj");
+ }
+
chaz_MakeFile_write(makefile);
chaz_MakeFile_destroy(makefile);
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b27af5b2/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index 40eaeb8..26ac692 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -233,6 +233,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
chaz_MakeRule_add_recursive_rm_command(clean_rule, "coverage");
}
+ if (chaz_Probe_msvc_version_num()) {
+ chaz_MakeRule_add_rm_command(clean_rule, "lemon.obj");
+ }
+
chaz_MakeFile_write(makefile);
chaz_MakeFile_destroy(makefile);
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b27af5b2/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
----------------------------------------------------------------------
diff --git a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
index 8c5843c..1e4d476 100644
--- a/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
+++ b/compiler/perl/lib/Clownfish/CFC/Perl/Build/Charmonic.pm
@@ -69,6 +69,10 @@ sub ACTION_charmony {
# Clean up after charmonizer if it doesn't succeed on its own.
$self->add_to_cleanup("_charm*");
+ if ($Config{cc} =~ /^cl\b/) {
+ $self->add_to_cleanup('charmonizer.obj');
+ }
+
# Prepare arguments to charmonizer.
my @command = (
$CHARMONIZER_EXE_PATH,
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b27af5b2/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.c b/runtime/common/charmonizer.c
index a17f425..d44c2fe 100644
--- a/runtime/common/charmonizer.c
+++ b/runtime/common/charmonizer.c
@@ -7326,6 +7326,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
chaz_MakeRule_add_recursive_rm_command(clean_rule, "coverage");
}
+ if (chaz_Probe_msvc_version_num()) {
+ chaz_MakeRule_add_rm_command(clean_rule, "test_cfish.obj");
+ }
+
chaz_MakeRule_add_make_command(clean_rule, cfc_dir, "clean");
distclean_rule = chaz_MakeFile_distclean_rule(makefile);
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/b27af5b2/runtime/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/runtime/common/charmonizer.main b/runtime/common/charmonizer.main
index 9f433e0..7b2a24f 100644
--- a/runtime/common/charmonizer.main
+++ b/runtime/common/charmonizer.main
@@ -314,6 +314,10 @@ S_write_makefile(struct chaz_CLIArgs *args) {
chaz_MakeRule_add_recursive_rm_command(clean_rule, "coverage");
}
+ if (chaz_Probe_msvc_version_num()) {
+ chaz_MakeRule_add_rm_command(clean_rule, "test_cfish.obj");
+ }
+
chaz_MakeRule_add_make_command(clean_rule, cfc_dir, "clean");
distclean_rule = chaz_MakeFile_distclean_rule(makefile);
[2/2] git commit: Update .gitignore files for MSVC
Posted by nw...@apache.org.
Update .gitignore files for MSVC
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/7baa94b7
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/7baa94b7
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/7baa94b7
Branch: refs/heads/master
Commit: 7baa94b7efcbf862bee7c6ab0d172d0b33b95a64
Parents: b27af5b
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Jul 21 13:41:07 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Jul 21 13:41:07 2014 +0200
----------------------------------------------------------------------
.gitignore | 1 +
compiler/c/.gitignore | 3 +++
compiler/perl/.gitignore | 2 ++
lemon/.gitignore | 1 +
runtime/c/.gitignore | 5 +++++
runtime/perl/.gitignore | 2 ++
6 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7baa94b7/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 2d9ea87..d236b17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.o
*.obj
+*.pdb
*.dSYM
*.gcda
*.gcno
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7baa94b7/compiler/c/.gitignore
----------------------------------------------------------------------
diff --git a/compiler/c/.gitignore b/compiler/c/.gitignore
index b5fef9b..bd44f7f 100644
--- a/compiler/c/.gitignore
+++ b/compiler/c/.gitignore
@@ -1,5 +1,8 @@
/Makefile
/cfc
+/cfc.exe
/charmonizer
+/charmonizer.exe
/charmony.h
/t/test_cfc
+/t/test_cfc.exe
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7baa94b7/compiler/perl/.gitignore
----------------------------------------------------------------------
diff --git a/compiler/perl/.gitignore b/compiler/perl/.gitignore
index 5517019..f11dde1 100644
--- a/compiler/perl/.gitignore
+++ b/compiler/perl/.gitignore
@@ -1,9 +1,11 @@
/Build
+/Build.bat
/Charmony.pm
/MYMETA.json
/MYMETA.yml
/_build/
/blib/
/charmonizer
+/charmonizer.exe
/charmony.h
/lib/Clownfish/CFC.c
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7baa94b7/lemon/.gitignore
----------------------------------------------------------------------
diff --git a/lemon/.gitignore b/lemon/.gitignore
index bde2990..7ac5cce 100644
--- a/lemon/.gitignore
+++ b/lemon/.gitignore
@@ -1 +1,2 @@
lemon
+lemon.exe
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7baa94b7/runtime/c/.gitignore
----------------------------------------------------------------------
diff --git a/runtime/c/.gitignore b/runtime/c/.gitignore
index d75d0aa..8778906 100644
--- a/runtime/c/.gitignore
+++ b/runtime/c/.gitignore
@@ -1,9 +1,14 @@
/Makefile
/autogen/
+/cfish-*.dll
+/cfish-*.exp
+/cfish-*.lib
/charmonizer
+/charmonizer.exe
/charmony.h
/libcfish.*.dylib
/libcfish.dylib
/libcfish.so
/libcfish.so.*
/t/test_cfish
+/t/test_cfish.exe
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7baa94b7/runtime/perl/.gitignore
----------------------------------------------------------------------
diff --git a/runtime/perl/.gitignore b/runtime/perl/.gitignore
index 09876c2..6221610 100644
--- a/runtime/perl/.gitignore
+++ b/runtime/perl/.gitignore
@@ -1,5 +1,6 @@
*.pod
/Build
+/Build.bat
/Charmony.pm
/MYMETA.json
/MYMETA.yml
@@ -7,6 +8,7 @@
/autogen/
/blib/
/charmonizer
+/charmonizer.exe
/charmonize.c
/charmony.h
/lib/Clownfish.c