3c54cb2a9d
git-bash/MSYS tries to resolve anything that looks like a path (i.e. anything starting with a /) - if the "target" doesn't exists, it just prepends the MSYS installation dir and breaks all kind of stuff. You could escape those with double-slash at the beginning, but that would mean lots of noise/unnecessary changes in pretty much every makefile, so just getting rid of that behavior is much better. ant and some externals however rely on MSYS path-conversion, so unset MSYS_NO_PATHCONV for those. Ant does its own checks whether it runs under cygwin or msys, and easier to please externals using the autoconversion than to add patches to force them into compliance… Change-Id: Ie80964e40c53ace80adb4707aae0db63ebc4ee4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166330 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
31 lines
1.1 KiB
Makefile
31 lines
1.1 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_ExternalProject_ExternalProject,java_websocket))
|
|
|
|
$(eval $(call gb_ExternalProject_register_targets,java_websocket,\
|
|
build \
|
|
))
|
|
|
|
$(call gb_ExternalProject_get_state_target,java_websocket,build) :
|
|
$(call gb_Trace_StartRange,java_websocket,EXTERNAL)
|
|
$(call gb_ExternalProject_run,build,\
|
|
unset MSYS_NO_PATHCONV && JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \
|
|
$(ICECREAM_RUN) "$(ANT)" \
|
|
$(if $(verbose),-v,-q) \
|
|
-f build.xml \
|
|
-Dbuild.label="build-$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)" \
|
|
-Dant.build.javac.source=$(JAVA_SOURCE_VER) \
|
|
-Dant.build.javac.target=$(JAVA_TARGET_VER) \
|
|
$(if $(debug),-Dbuild.debug="on") \
|
|
jar \
|
|
)
|
|
$(call gb_Trace_EndRange,java_websocket,EXTERNAL)
|
|
|
|
# vim: set noet sw=4 ts=4:
|