You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/04/04 12:21:13 UTC
[1/2] brooklyn-client git commit: Fix Windows build
Repository: brooklyn-client
Updated Branches:
refs/heads/master 37aa54f2b -> 1b4abbbd5
Fix Windows build
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/444e78b3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/444e78b3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/444e78b3
Branch: refs/heads/master
Commit: 444e78b37f169a318c3727698cab1b232830d531
Parents: 37aa54f
Author: Svetoslav Neykov <sv...@neykov.name>
Authored: Sun Apr 3 11:00:44 2016 +0300
Committer: Svetoslav Neykov <sv...@neykov.name>
Committed: Sun Apr 3 11:00:44 2016 +0300
----------------------------------------------------------------------
.gitattributes | 6 ++++++
build.xml | 7 +++++--
release/build.bat | 24 ++++++++++++++++++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/444e78b3/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..7920d0e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+#Don't auto-convert line endings for shell scripts on Windows (breaks the scripts)
+* text=auto
+*.sh text eol=lf
+*.bat text eol=crlf
+*.ps1 text eol=crlf
+*.ini text eol=crlf
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/444e78b3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fa66790..713b339 100644
--- a/build.xml
+++ b/build.xml
@@ -17,9 +17,12 @@
under the License.
-->
<project name="CLI" >
- <property name="build.script" location="${basedir}/release/build.sh"/>
+ <condition property="platform.extension" value=".bat" else=".sh">
+ <os family="windows" />
+ </condition>
+ <property name="build.script" location="${basedir}/release/build${platform.extension}"/>
- <target name="all" >
+ <target name="all" >
<exec executable="${build.script}" failonerror="true">
<arg value="-A"/>
<arg value="-t"/>
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/444e78b3/release/build.bat
----------------------------------------------------------------------
diff --git a/release/build.bat b/release/build.bat
new file mode 100644
index 0000000..cbef33a
--- /dev/null
+++ b/release/build.bat
@@ -0,0 +1,24 @@
+@echo off
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
+REM TODO
+echo.
+echo brooklyn-client CLI build not supported on Windows platforms, run maven with '-Dno-go-client' to skip.
+echo.
+
+exit 1
[2/2] brooklyn-client git commit: Closes #13
Posted by sv...@apache.org.
Closes #13
Fix build on Windows
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/1b4abbbd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/1b4abbbd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/1b4abbbd
Branch: refs/heads/master
Commit: 1b4abbbd5b48beee32f07ba47806fd8577a69884
Parents: 37aa54f 444e78b
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Apr 4 13:21:03 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Apr 4 13:21:03 2016 +0300
----------------------------------------------------------------------
.gitattributes | 6 ++++++
build.xml | 7 +++++--
release/build.bat | 24 ++++++++++++++++++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------