You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2014/03/31 22:23:40 UTC
[4/5] git commit: Improved the error handling when generating java
from wsdl in the wsgen addon.
Improved the error handling when generating java from wsdl in the wsgen addon.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/7c8b3724
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/7c8b3724
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/7c8b3724
Branch: refs/heads/master
Commit: 7c8b37249d830dd1be9686503af412e49455549a
Parents: 6a75009
Author: Peter Donald <pe...@realityforge.org>
Authored: Sat Mar 29 16:06:40 2014 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Tue Apr 1 07:21:47 2014 +1100
----------------------------------------------------------------------
CHANGELOG | 2 ++
lib/buildr/ide/idea.rb | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/7c8b3724/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index d23a3e1..d234344 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.16 (Pending)
+* Fixed: Remove the projectname.ids file when rebuilding the idea
+ project file avoiding conflict with idea.
* Change: Improved the error handling when generating java from wsdl
in the wsgen addon.
* Change: Upgraded the Checkstyle plugin to use checkstyle 5.7 that
http://git-wip-us.apache.org/repos/asf/buildr/blob/7c8b3724/lib/buildr/ide/idea.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb
index 3559528..1931a96 100644
--- a/lib/buildr/ide/idea.rb
+++ b/lib/buildr/ide/idea.rb
@@ -1086,6 +1086,10 @@ module Buildr #:nodoc:
end
mv temp_filename, ideafile.filename
end
+ if project.ipr?
+ filename = project._("#{project.ipr.name}.ids")
+ rm_rf filename if File.exists?(filename)
+ end
end
project.task("idea:clean") do