Added eclipse and idea project files to be ignored by packager and cleaned gitignore file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/76b0b9a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/76b0b9a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/76b0b9a7 Branch: refs/heads/master Commit: 76b0b9a78535d4efba23e5eb0382167449de0ba2 Parents: 1cf4bf7 Author: wisebaldone <[email protected]> Authored: Wed Dec 16 17:25:13 2015 +1000 Committer: wisebaldone <[email protected]> Committed: Wed Dec 16 17:25:13 2015 +1000 ---------------------------------------------------------------------- .gitignore | 15 +++++++-------- build.gradle | 15 +++++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/76b0b9a7/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index be8980b..b8ef753 100755 --- a/.gitignore +++ b/.gitignore @@ -10,11 +10,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -/build -/test_out -/dist -/gen -/bin */server.config */_sessions */_accounts @@ -26,10 +21,9 @@ war/WEB-INF *.old *.log* -/third_party/ -/src/org/waveprotocol/box/server/rpc/atmosphere/atmosphere-min.js -/src/org/waveprotocol/box/server/rpc/atmosphere/atmosphere.js .DS_Store + +### IntelliJ Idea .idea *.iml *.eml @@ -37,6 +31,11 @@ war/WEB-INF *.iws .settings/ +### Eclipse +*.project +*.classpath +*/.settings/ + ### Gradle .gradle build/ http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/76b0b9a7/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 1b30f98..375434e 100644 --- a/build.gradle +++ b/build.gradle @@ -94,9 +94,15 @@ task createDistSourceZip(type: Zip) { '*/build/*', '*/_*', '*/gwt-unitCache/', + '*.iml', '*/*.iml', - '*/*.iws', - '*/*.ipr', + '*.iws', + '*.ipr', + '*.project', + '*/*.project', + '*/*.classpath', + '*/.settings/', + '*/*.log*', 'reports/', 'wave/war/WEB-INF', 'wave/war/webclient' @@ -121,6 +127,11 @@ task createDistSourceTar(type: Tar) { '*/*.iml', '*.iws', '*.ipr', + '*.project', + '*/*.project', + '*/*.classpath', + '*/.settings/', + '*/*.log*', 'reports/', 'wave/war/WEB-INF', 'wave/war/webclient'
