std.mk (8b8620b8) std.mk (789d489d)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 40 unchanged lines hidden (view full) ---

49URE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
50URE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)"
51
52OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
53OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)"
54
55OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
56
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 40 unchanged lines hidden (view full) ---

49URE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
50URE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)"
51
52OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)"
53OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)"
54
55OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
56
57JAVA_OPTIONS=
58ifneq "$(OO_SDK_JAVA_HOME)" ""
59JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
60ifeq "$(JAVA_BITS)" "64-Bit"
57ifneq "$(OO_SDK_JAVA_HOME)" ""
58JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
59ifeq "$(JAVA_BITS)" "64-Bit"
61ifneq "$(PLATFORM)" "linux"
62JAVA_OPTIONS=-d32
60JAVA_OPTIONS=-32
61
62ifeq "$(PLATFORM)" "linux"
63JAVA_OPTIONS=
63endif
64endif
65ifeq "$(PLATFORM)" "macosx"
66JAVA_OPTIONS=
64endif
67endif
68
65endif
69endif
70endif
66
67ifeq "$(PLATFORM)" "macosx"
68OFFICE_LAUNCHER=DYLD_LIBRARY_PATH="" && "$(OFFICE_PROGRAM_PATH)$(PS)soffice"
69else
70OFFICE_LAUNCHER="$(OFFICE_PROGRAM_PATH)$(PS)soffice"
71endif
72
73DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f

--- 22 unchanged lines hidden --- 		71
72ifeq "$(PLATFORM)" "macosx"
73OFFICE_LAUNCHER=DYLD_LIBRARY_PATH="" && "$(OFFICE_PROGRAM_PATH)$(PS)soffice"
74else
75OFFICE_LAUNCHER="$(OFFICE_PROGRAM_PATH)$(PS)soffice"
76endif
77
78DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f

--- 22 unchanged lines hidden ---