[Libreoffice-commits] .: 9 commits - automation/AllLangResTarget_tma.mk automation/Executable_miniapp.mk automation/Executable_testtool.mk automation/inc automation/Library_communi.mk automation/Library_simplecm.mk automation/Library_sts.mk automation/Makefile automation/Module_automation.mk automation/Package_hid.mk automation/Package_inc.mk automation/Package_packimages.mk automation/Package_testtool.mk automation/packimages automation/prj automation/source automation/util desktop/unx RepositoryFixes.mk Repository.mk scp2/source solenv/bin solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Wed Sep 14 22:12:28 PDT 2011
Repository.mk | 5
RepositoryFixes.mk | 4
automation/AllLangResTarget_tma.mk | 44 ++++
automation/Executable_miniapp.mk | 66 ++++++
automation/Executable_testtool.mk | 117 ++++++++++++
automation/Library_communi.mk | 65 ++++++
automation/Library_simplecm.mk | 52 +++++
automation/Library_sts.mk | 102 ++++++++++
automation/Makefile | 39 ++++
automation/Module_automation.mk | 40 ++++
automation/Package_hid.mk | 30 +++
automation/Package_inc.mk | 37 +++
automation/Package_packimages.mk | 43 ++++
automation/Package_testtool.mk | 55 +++++
automation/inc/automation/automation.hxx | 4
automation/inc/automation/communi.hxx | 16 -
automation/inc/automation/communidllapi.h | 43 ++++
automation/inc/automation/simplecm.hxx | 14 -
automation/inc/automation/simplecmdllapi.h | 43 ++++
automation/inc/automation/stsdllapi.h | 43 ++++
automation/inc/makefile.mk | 47 ----
automation/packimages/Makefile | 46 ++++
automation/packimages/makefile.mk | 62 ------
automation/prj/build.lst | 10 -
automation/prj/d.lst | 27 --
automation/prj/makefile.mk | 40 ++++
automation/source/app/makefile.mk | 52 -----
automation/source/communi/makefile.mk | 46 ----
automation/source/inc/cmdbasestream.hxx | 4
automation/source/inc/svcommstream.hxx | 4
automation/source/miniapp/makefile.mk | 54 -----
automation/source/server/makefile.mk | 69 -------
automation/source/simplecm/makefile.mk | 46 ----
automation/source/testtool/Makefile | 57 +++++
automation/source/testtool/filter.pl | 2
automation/source/testtool/makefile.mk | 107 -----------
automation/util/makefile.mk | 278 -----------------------------
desktop/unx/source/args.c | 1
desktop/unx/source/splashx.c | 10 -
desktop/unx/source/start.c | 6
scp2/source/testtool/file_testtool.scp | 15 -
scp2/source/testtool/module_testtool.scp | 2
solenv/bin/packimages.pl | 6
solenv/gbuild/CustomTarget.mk | 2
solenv/gbuild/Zip.mk | 23 ++
45 files changed, 1039 insertions(+), 839 deletions(-)
New commits:
commit 45589f1f27be2d93c250e900102d66af0d2b694d
Author: David Tardon <dtardon at redhat.com>
Date: Thu Sep 15 07:10:22 2011 +0200
gbuildize automation
diff --git a/Repository.mk b/Repository.mk
index f13f72d..59c2dd8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
$(eval $(call gb_Helper_register_executables,OOO, \
spadmin.bin \
+ testtool \
))
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
@@ -52,6 +53,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basctl \
basebmp \
canvastools \
+ communi \
date \
forui \
odbc \
@@ -112,11 +114,13 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sdfilt \
sdui \
sfx \
+ simplecm \
sm \
smd \
solver \
sot \
spa \
+ sts \
svl \
svt \
svx \
@@ -252,6 +256,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
libeay32 \
ssleay32 \
ooopathutils \
+ salmain \
sample \
salcpprt \
vclmain \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 185d2fc..fed52cd 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -37,6 +37,9 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
+
+# TODO: this is a hack; we should really build salmain as a regular static library
+gb_StaticLibrary_FILENAMES := $(subst salmain:libsalmain.a,salmain:salmain.o,$(gb_StaticLibrary_FILENAMES))
endif
ifeq ($(OS),WNT)
@@ -52,6 +55,7 @@ gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES))
+gb_StaticLibrary_FILENAMES := $(subst salmain:libsalmain.a,salmain:salmain.obj,$(gb_StaticLibrary_FILENAMES))
ifeq ($(COM),GCC)
gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES))
diff --git a/automation/AllLangResTarget_tma.mk b/automation/AllLangResTarget_tma.mk
new file mode 100644
index 0000000..6cb59f3
--- /dev/null
+++ b/automation/AllLangResTarget_tma.mk
@@ -0,0 +1,44 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,tma))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,tma,automation))
+
+$(eval $(call gb_AllLangResTarget_add_srs,tma,\
+ tma/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,tma/res))
+
+$(eval $(call gb_SrsTarget_set_include,tma/res,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,tma/res,\
+ automation/source/miniapp/servres.src \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk
new file mode 100644
index 0000000..7ddd9d9
--- /dev/null
+++ b/automation/Executable_miniapp.mk
@@ -0,0 +1,66 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# TODO: this seems to be unused?
+
+$(eval $(call gb_Executable_Executable,miniapp))
+
+$(eval $(call gb_Executable_set_targettype_gui,miniapp,YES))
+
+$(eval $(call gb_Executable_add_precompiled_header,miniapp,automation/inc/pch/precompiled_automation.hxx))
+
+$(eval $(call gb_Executable_set_include,miniapp,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc/pch \
+))
+
+$(eval $(call gb_Executable_add_api,miniapp,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,miniapp,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sts \
+ svt \
+ tl \
+ ucbhelper \
+ vcl \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,miniapp,\
+ salmain \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,miniapp,\
+ automation/source/miniapp/editwin \
+ automation/source/miniapp/servres \
+ automation/source/miniapp/testapp \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Executable_testtool.mk b/automation/Executable_testtool.mk
new file mode 100644
index 0000000..8d9327c
--- /dev/null
+++ b/automation/Executable_testtool.mk
@@ -0,0 +1,117 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Executable_Executable,testtool))
+
+$(eval $(call gb_Executable_set_targettype_gui,testtool,YES))
+
+$(eval $(call gb_Executable_add_package_headers,testtool,\
+ automation_testtool \
+))
+
+$(eval $(call gb_Executable_add_precompiled_header,testtool,automation/inc/pch/precompiled_automation.hxx))
+
+$(eval $(call gb_Executable_set_include,testtool,\
+ $$(INCLUDE) \
+ -I$(call gb_CustomTarget_get_workdir,automation/source/testtool) \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+$(eval $(call gb_Executable_add_api,testtool,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,testtool,\
+ comphelper \
+ communi \
+ cppu \
+ cppuhelper \
+ sal \
+ sb \
+ simplecm \
+ sts \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(if $(findstring WNT,$(GUI)),\
+ advapi32 \
+ shell32 \
+ ) \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,testtool,\
+ app \
+ salmain \
+ sample \
+))
+
+ifeq ($(OS),SOLARIS)
+
+$(eval $(call gb_Executable_add_libs,testtool,\
+ -lXm
+))
+
+endif
+
+ifeq ($(GUI) $(OS),UNX LINUX)
+
+$(eval $(call gb_Executable_add_libs,testtool,\
+ -lXext \
+ -lX11 \
+ -lSM \
+ -lICE \
+))
+
+endif
+
+$(eval $(call gb_Executable_add_noexception_objects,testtool,\
+ automation/source/app/testbasi \
+ automation/source/testtool/cretstrm \
+ automation/source/testtool/httprequest \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,testtool,\
+ automation/source/testtool/cmdstrm \
+ automation/source/testtool/comm_bas \
+ automation/source/testtool/objtest \
+ automation/source/testtool/tcommuni \
+))
+
+ifeq ($(GUI),WNT)
+
+$(eval $(call gb_Executable_add_noexception_objects,testtool,\
+ automation/source/testtool/registry_win \
+ automation/source/testtool/sysdir_win \
+))
+
+endif
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Library_communi.mk b/automation/Library_communi.mk
new file mode 100644
index 0000000..263b8f1
--- /dev/null
+++ b/automation/Library_communi.mk
@@ -0,0 +1,65 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,communi))
+
+$(eval $(call gb_Library_add_package_headers,communi,\
+ automation_inc \
+))
+
+$(eval $(call gb_Library_add_precompiled_header,communi,automation/inc/pch/precompiled_automation.hxx))
+
+$(eval $(call gb_Library_set_include,communi,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/inc \
+))
+
+$(eval $(call gb_Library_add_api,communi,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,communi,\
+ -DCOMMUNI_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ sal \
+ simplecm \
+ svl \
+ tl \
+ vcl \
+ $(if $(findstring WNT,$(GUI)),\
+ advapi32 \
+ gdi32 \
+ ) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,communi,\
+ automation/source/communi/communi \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Library_simplecm.mk b/automation/Library_simplecm.mk
new file mode 100644
index 0000000..00b7ace
--- /dev/null
+++ b/automation/Library_simplecm.mk
@@ -0,0 +1,52 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,simplecm))
+
+$(eval $(call gb_Library_add_precompiled_header,simplecm,automation/inc/pch/precompiled_automation.hxx))
+
+$(eval $(call gb_Library_set_include,simplecm,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,simplecm,\
+ -DSIMPLECM_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,simplecm,\
+ sal \
+ tl \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,simplecm,\
+ automation/source/simplecm/packethandler \
+ automation/source/simplecm/simplecm \
+ automation/source/simplecm/tcpio \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk
new file mode 100644
index 0000000..eb21f5d
--- /dev/null
+++ b/automation/Library_sts.mk
@@ -0,0 +1,102 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,sts))
+
+$(eval $(call gb_Library_add_precompiled_header,sts,automation/inc/pch/precompiled_automation.hxx))
+
+$(eval $(call gb_Library_set_include,sts,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/CustomTarget/automation/source/testtool \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+ -I$(SRCDIR)/automation/inc \
+))
+
+$(eval $(call gb_Library_add_api,sts,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,sts,\
+ -DSTS_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sts,\
+ communi \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sb \
+ simplecm \
+ sot \
+ svl \
+ svt \
+ tl \
+ utl \
+ vcl \
+ $(if $(findstring WNT,$(GUI)),\
+ advapi32 \
+ gdi32 \
+ ) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sts,\
+ automation/source/server/XMLParser \
+ automation/source/server/profiler \
+ automation/source/server/recorder \
+ automation/source/server/server \
+ automation/source/server/sta_list \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/server/cmdbasestream \
+ automation/source/server/editwin \
+ automation/source/server/retstrm \
+ automation/source/server/scmdstrm \
+ automation/source/server/svcommstream \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,sts,\
+ automation/source/server/statemnt \
+ ,$(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+ifeq ($(OS),SOLARIS)
+
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/server/prof_usl \
+))
+
+else
+
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/server/prof_nul \
+))
+
+endif
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Makefile b/automation/Makefile
new file mode 100644
index 0000000..8d71119
--- /dev/null
+++ b/automation/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/automation/Module_automation.mk b/automation/Module_automation.mk
new file mode 100644
index 0000000..5a30f9b
--- /dev/null
+++ b/automation/Module_automation.mk
@@ -0,0 +1,40 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,automation))
+
+$(eval $(call gb_Module_add_targets,automation,\
+ AllLangResTarget_tma \
+ Executable_testtool \
+ Library_communi \
+ Library_simplecm \
+ Library_sts \
+ Package_hid \
+ Package_inc \
+ Package_packimages \
+ Package_testtool \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Package_hid.mk b/automation/Package_hid.mk
new file mode 100644
index 0000000..fff48d1
--- /dev/null
+++ b/automation/Package_hid.mk
@@ -0,0 +1,30 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,automation_hid,$(SRCDIR)/automation/util))
+
+$(eval $(call gb_Package_add_file,automation_hid,bin/hid/manually_added_ids.hid,manually_added_ids.hid))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/automation/Package_inc.mk b/automation/Package_inc.mk
new file mode 100644
index 0000000..cf02c11
--- /dev/null
+++ b/automation/Package_inc.mk
@@ -0,0 +1,37 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,automation_inc,$(SRCDIR)/automation/inc/automation))
+
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/automation.hxx,automation.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/commdefines.hxx,commdefines.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/commtypes.hxx,commtypes.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/communi.hxx,communi.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/communidllapi.h,communidllapi.h))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/simplecm.hxx,simplecm.hxx))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/simplecmdllapi.h,simplecmdllapi.h))
+$(eval $(call gb_Package_add_file,automation_inc,inc/automation/stsdllapi.h,stsdllapi.h))
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/Package_packimages.mk b/automation/Package_packimages.mk
new file mode 100644
index 0000000..f768372
--- /dev/null
+++ b/automation/Package_packimages.mk
@@ -0,0 +1,43 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+# TODO: this is probably the same procedure that is used in
+# postprocess/packimages -> good candidate for a gbuild class
+
+$(eval $(call gb_Package_Package,automation_packimages,$(call gb_CustomTarget_get_workdir,automation/packimages)))
+
+$(eval $(call gb_Package_add_file,automation_packimages,bin/images_tt.zip,images_tt.zip))
+
+$(eval $(call gb_Package_add_customtarget,automation_packimages,automation/packimages,SRCDIR))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,automation/packimages,\
+ $(OUTDIR)/res/img/fps_officeen-US.ilst \
+ $(OUTDIR)/res/img/sben-US.ilst \
+ $(OUTDIR)/res/img/stten-US.ilst \
+ $(OUTDIR)/res/img/svten-US.ilst \
+ $(OUTDIR)/res/img/vclen-US.ilst \
+))
+
+# vim: set ts=4 sw=4 noet:
diff --git a/automation/Package_testtool.mk b/automation/Package_testtool.mk
new file mode 100644
index 0000000..b2f0076
--- /dev/null
+++ b/automation/Package_testtool.mk
@@ -0,0 +1,55 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,automation_testtool,$(WORKDIR)/CustomTarget/automation/source/testtool))
+
+$(eval $(call gb_Package_add_file,automation_testtool,bin/classes,classes))
+$(eval $(call gb_Package_add_file,automation_testtool,bin/keycodes,keycodes))
+$(eval $(call gb_Package_add_file,automation_testtool,bin/res_type,res_type))
+
+ifeq ($(GUI),UNX)
+
+$(eval $(call gb_Package_add_file,automation_testtool,bin/testtoolrc,testtool.ini))
+
+else ifeq ($(GUI),WNT)
+
+$(eval $(call gb_Package_add_file,automation_testtool,bin/testtool.ini,testtool.ini))
+
+endif
+
+$(eval $(call gb_Package_add_customtarget,automation_testtool,automation/source/testtool,SRCDIR))
+
+$(eval $(call gb_CustomTarget_add_dependencies,automation/source/testtool,\
+ automation/source/inc/rcontrol.hxx \
+ automation/source/testtool/filter.pl \
+ automation/source/testtool/testtool.ini \
+))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,automation/source/testtool,\
+ $(OUTDIR)/inc/tools/wintypes.hxx \
+ $(OUTDIR)/inc/vcl/keycodes.hxx \
+))
+
+# vim: set ts=4 sw=4 et:
diff --git a/automation/inc/automation/automation.hxx b/automation/inc/automation/automation.hxx
index aaf54e2..8549bc7 100644
--- a/automation/inc/automation/automation.hxx
+++ b/automation/inc/automation/automation.hxx
@@ -28,9 +28,11 @@
#ifndef AUTOMATION_HXX
#define AUTOMATION_HXX
+#include "automation/stsdllapi.h"
+
class ImplRemoteControl;
-class RemoteControl
+class STS_DLLPUBLIC RemoteControl
{
ImplRemoteControl* pImpl;
public:
diff --git a/automation/inc/automation/communi.hxx b/automation/inc/automation/communi.hxx
index c416d77..1435512 100644
--- a/automation/inc/automation/communi.hxx
+++ b/automation/inc/automation/communi.hxx
@@ -29,6 +29,8 @@
#ifndef _COMMUNI_HXX
#define _COMMUNI_HXX
+#include "automation/communidllapi.h"
+
#include <svl/svarray.hxx>
#include <osl/thread.hxx>
#include <osl/mutex.hxx>
@@ -42,7 +44,7 @@ class SvMemoryStream;
class CommunicationManagerServerAcceptThread;
SV_DECL_PTRARR_SORT( CommunicationLinkList, CommunicationLink*, 1, 10 )
-class MultiCommunicationManager : public CommunicationManager
+class COMMUNI_DLLPUBLIC MultiCommunicationManager : public CommunicationManager
{
public:
MultiCommunicationManager( sal_Bool bUseMultiChannel = sal_False );
@@ -65,19 +67,19 @@ protected:
sal_Bool bGracefullShutdown;
};
-class CommunicationManagerServer : public MultiCommunicationManager
+class COMMUNI_DLLPUBLIC CommunicationManagerServer : public MultiCommunicationManager
{
public:
CommunicationManagerServer( sal_Bool bUseMultiChannel = sal_False ):MultiCommunicationManager( bUseMultiChannel ){;}
};
-class CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient
+class COMMUNI_DLLPUBLIC CommunicationManagerClient : public MultiCommunicationManager, public ICommunicationManagerClient
{
public:
CommunicationManagerClient( sal_Bool bUseMultiChannel = sal_False );
};
-class CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread
+class COMMUNI_DLLPUBLIC CommunicationLinkViaSocket : public SimpleCommunicationLinkViaSocket, public osl::Thread
{
public:
CommunicationLinkViaSocket( CommunicationManager *pMan, osl::StreamSocket* pSocket );
@@ -113,7 +115,7 @@ protected:
Link mlPutDataReceived;
};
-class CommunicationManagerServerViaSocket : public CommunicationManagerServer
+class COMMUNI_DLLPUBLIC CommunicationManagerServerViaSocket : public CommunicationManagerServer
{
friend class CommunicationManagerServerAcceptThread;
public:
@@ -134,7 +136,7 @@ private:
void AddConnection( CommunicationLink *pNewConnection );
};
-class CommunicationManagerServerAcceptThread: public osl::Thread
+class COMMUNI_DLLPUBLIC CommunicationManagerServerAcceptThread: public osl::Thread
{
public:
CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, sal_uLong nPort, sal_uInt16 nMaxCon = CM_UNLIMITED_CONNECTIONS );
@@ -159,7 +161,7 @@ private:
DECL_LINK( AddConnection, void* );
};
-class CommunicationManagerClientViaSocket : public CommunicationManagerClient, CommonSocketFunctions
+class COMMUNI_DLLPUBLIC CommunicationManagerClientViaSocket : public CommunicationManagerClient, CommonSocketFunctions
{
public:
using CommunicationManager::StartCommunication;
diff --git a/automation/inc/automation/communidllapi.h b/automation/inc/automation/communidllapi.h
new file mode 100644
index 0000000..637d00d
--- /dev/null
+++ b/automation/inc/automation/communidllapi.h
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_AUTOMATION_COMMUNIDLLAPI_H
+#define INCLUDED_AUTOMATION_COMMUNIDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined(COMMUNI_DLLIMPLEMENTATION)
+#define COMMUNI_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define COMMUNI_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define COMMUNI_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/inc/automation/simplecm.hxx b/automation/inc/automation/simplecm.hxx
index 96e55ca..cc735a9 100644
--- a/automation/inc/automation/simplecm.hxx
+++ b/automation/inc/automation/simplecm.hxx
@@ -28,6 +28,8 @@
#ifndef _SIMPLECM_HXX
#define _SIMPLECM_HXX
+#include "automation/simplecmdllapi.h"
+
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <tools/stream.hxx>
@@ -101,7 +103,7 @@ class CommunicationLink;
SV_DECL_REF( CommunicationLink )
-class InfoString : public ByteString
+class SIMPLECM_DLLPUBLIC InfoString : public ByteString
{
public:
InfoString( ByteString &nMsg, CM_InfoType nIT, CommunicationLink *pCL = NULL ): ByteString( nMsg ), nInfoType( nIT ), pCommLink( pCL ) {;}
@@ -116,7 +118,7 @@ class PacketHandler;
class CommunicationManager;
class MultiCommunicationManager;
class CommunicationManagerServerAcceptThread;
-class CommunicationLink : public SvRefBase
+class SIMPLECM_DLLPUBLIC CommunicationLink : public SvRefBase
{
protected:
friend class CommunicationManager;
@@ -213,7 +215,7 @@ public:
SV_IMPL_REF( CommunicationLink );
class CommonSocketFunctions;
-class CommunicationManager
+class SIMPLECM_DLLPUBLIC CommunicationManager
{
friend class CommunicationLink;
friend class CommonSocketFunctions;
@@ -281,7 +283,7 @@ private:
sal_Bool bIsMultiChannel;
};
-class ICommunicationManagerClient
+class SIMPLECM_DLLPUBLIC ICommunicationManagerClient
{
friend class CommonSocketFunctions;
protected:
@@ -289,7 +291,7 @@ protected:
};
class TCPIO;
-class SimpleCommunicationLinkViaSocket : public CommunicationLink
+class SIMPLECM_DLLPUBLIC SimpleCommunicationLinkViaSocket : public CommunicationLink
{
public:
virtual sal_Bool IsCommunicationError();
@@ -322,7 +324,7 @@ protected:
void SetNewPacketAsCurrent();
};
-class CommonSocketFunctions
+class SIMPLECM_DLLPUBLIC CommonSocketFunctions
{
public:
sal_Bool DoStartCommunication( CommunicationManager *pCM, ICommunicationManagerClient *pCMC, ByteString aHost, sal_uLong nPort );
diff --git a/automation/inc/automation/simplecmdllapi.h b/automation/inc/automation/simplecmdllapi.h
new file mode 100644
index 0000000..08c262a
--- /dev/null
+++ b/automation/inc/automation/simplecmdllapi.h
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_AUTOMATION_SIMPLECMDLLAPI_H
+#define INCLUDED_AUTOMATION_SIMPLECMDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined(SIMPLECM_DLLIMPLEMENTATION)
+#define SIMPLECM_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define SIMPLECM_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define SIMPLECM_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/inc/automation/stsdllapi.h b/automation/inc/automation/stsdllapi.h
new file mode 100644
index 0000000..e7c3c64
--- /dev/null
+++ b/automation/inc/automation/stsdllapi.h
@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#ifndef INCLUDED_AUTOMATION_STSDLLAPI_H
+#define INCLUDED_AUTOMATION_STSDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined(STS_DLLIMPLEMENTATION)
+#define STS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define STS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define STS_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/inc/makefile.mk b/automation/inc/makefile.mk
deleted file mode 100644
index 782b6a8..0000000
--- a/automation/inc/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=automation
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/automation/packimages/Makefile b/automation/packimages/Makefile
new file mode 100644
index 0000000..69631bb
--- /dev/null
+++ b/automation/packimages/Makefile
@@ -0,0 +1,46 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+BINDIR := $(dir $(GBUILDDIR))bin
+BASEDIR := $(dir $(firstword $(MAKEFILE_LIST)))
+
+ILSTS := \
+ $(OUTDIR)/res/img/fps_officeen-US.ilst \
+ $(OUTDIR)/res/img/sben-US.ilst \
+ $(OUTDIR)/res/img/stten-US.ilst \
+ $(OUTDIR)/res/img/svten-US.ilst \
+ $(OUTDIR)/res/img/vclen-US.ilst \
+
+images_tt.zip :
+ cp $(ILSTS) . \
+ && $(PERL) $(BINDIR)/packimages.pl -g $(SRCDIR)/default_images -m $(SRCDIR)/default_images -c $(CURDIR) -l $(CURDIR) -o $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : images_tt.zip
+
+# vim: set ts=4 sw=4 noet:
diff --git a/automation/packimages/makefile.mk b/automation/packimages/makefile.mk
deleted file mode 100644
index 3059541..0000000
--- a/automation/packimages/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-PRJNAME=automation
-TARGET=packimages
-RSCCUSTOMIMG*=$(PRJ)$/util
-
-# point to an existing directory as default that poses no threat
-# to a "find" that looks for "*.png"
-RSCCUSTOMIMG*=$(PRJNAME)$/util
-
-# point to an existing directory as default that poses no threat
-# to a "find" that looks for "*.png"
-RSCCUSTOMIMG*=$(PRJNAME)$/util
-
-.INCLUDE: settings.mk
-
-.INCLUDE: target.mk
-
-ALLTAR : \
- $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_tt.zip
-
-#solarenv = j:\so-cwsserv04\gh7\SRC680\src.m50\solenv
-#outpath = wntmsci10
-#common_outdir = common
-#solarresdir = j:\so-cwsserv04\gh7\SRC680\wntmsci10\res.m50
-
-
-$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/images_tt.zip .PHONY:
- @echo ------------------------------
- @echo Making: $@
- $(COMMAND_ECHO)$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/stt*.ilst $(MISC)
- $(COMMAND_ECHO)$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/svt*.ilst $(MISC)
- $(COMMAND_ECHO)$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/fps*.ilst $(MISC)
- $(COMMAND_ECHO)$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/vcl*.ilst $(MISC)
- $(COMMAND_ECHO)$(COPY) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SOLARRESDIR))$/img$/sb*.ilst $(MISC)
- @-$(MKDIR) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN)) >& $(NULLDEV)
- $(COMMAND_ECHO)$(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(MISC) -o $@
diff --git a/automation/prj/build.lst b/automation/prj/build.lst
index b019873..15e8330 100644
--- a/automation/prj/build.lst
+++ b/automation/prj/build.lst
@@ -1,11 +1,3 @@
au automation : basic fpicker NULL
au automation usr1 - all au_mkout NULL
-au automation\inc nmake - all au_inc NULL
-au automation\source\simplecm nmake - all au_scom au_inc NULL
-au automation\source\communi nmake - all au_comm au_inc NULL
-au automation\source\app nmake - all au_app au_inc NULL
-au automation\source\server nmake - all au_server au_inc NULL
-au automation\source\testtool nmake - all au_tt au_inc NULL
-au automation\source\miniapp nmake - all au_mini au_inc NULL
-au automation\packimages nmake - all au_pack NULL
-au automation\util nmake - all au_util au_scom au_comm au_app au_mini au_server au_tt NULL
+au automation\prj nmake - all au_prj NULL
diff --git a/automation/prj/d.lst b/automation/prj/d.lst
index 69f82e4..e69de29 100644
--- a/automation/prj/d.lst
+++ b/automation/prj/d.lst
@@ -1,27 +0,0 @@
-mkdir: %COMMON_DEST%\bin\hid
-mkdir: %_DEST%\inc\automation
-
-#..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid
-..\util\manually_added_ids.hid %COMMON_DEST%\bin\hid\manually_added_ids.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\lib\lib* %_DEST%\lib\*
-..\%__SRC%\lib\ists.lib %_DEST%\lib\ists.lib
-..\%__SRC%\lib\isimplecm.lib %_DEST%\lib\isimplecm.lib
-..\%__SRC%\lib\icommuni.lib %_DEST%\lib\icommuni.lib
-
-..\inc\automation\automation.hxx %_DEST%\inc\automation\automation.hxx
-..\inc\automation\commdefines.hxx %_DEST%\inc\automation\commdefines.hxx
-..\inc\automation\commtypes.hxx %_DEST%\inc\automation\commtypes.hxx
-..\inc\automation\communi.hxx %_DEST%\inc\automation\communi.hxx
-..\inc\automation\simplecm.hxx %_DEST%\inc\automation\simplecm.hxx
-
-..\%__SRC%\bin\testtool.exe %_DEST%\bin\testtool.bin
-..\%__SRC%\bin\testtool %_DEST%\bin\testtool.bin
-..\%__SRC%\inc\classes %_DEST%\bin\classes
-..\%__SRC%\inc\keycodes %_DEST%\bin\keycodes
-..\%__SRC%\inc\res_type %_DEST%\bin\res_type
-
-..\%COMMON_OUTDIR%\bin\images_tt.zip %COMMON_DEST%\bin\images_tt.zip
-
-..\%__SRC%\bin\testtoolrc %_DEST%\lib\testtoolrc
-..\%__SRC%\bin\testtool.ini %_DEST%\bin\testtool.ini
diff --git a/automation/prj/makefile.mk b/automation/prj/makefile.mk
new file mode 100755
index 0000000..ffd9fb2
--- /dev/null
+++ b/automation/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/automation/source/app/makefile.mk b/automation/source/app/makefile.mk
deleted file mode 100644
index 8a430b3..0000000
--- a/automation/source/app/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=automation
-TARGET=app
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ------------------------------------------------------------
-
-CXXFILES = \
- testbasi.cxx
-
-
-OBJFILES = \
- $(OBJ)$/testbasi.obj
-
-
-LIBTARGET = NO
-
-
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/automation/source/communi/makefile.mk b/automation/source/communi/makefile.mk
deleted file mode 100644
index b4ca9c6..0000000
--- a/automation/source/communi/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=automation
-TARGET=communi
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= $(EXCEPTIONSFILES)
-
-EXCEPTIONSFILES= \
- $(SLO)$/communi.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx
index 7011299..296be50 100644
--- a/automation/source/inc/cmdbasestream.hxx
+++ b/automation/source/inc/cmdbasestream.hxx
@@ -37,10 +37,12 @@
#ifndef _CMDBASESTREAM_HXX_
#define _CMDBASESTREAM_HXX_
+#include "automation/stsdllapi.h"
+
#include <automation/commtypes.hxx>
#include "icommstream.hxx"
-class CmdBaseStream
+class STS_DLLPUBLIC CmdBaseStream
{
protected:
ICommStream* pCommStream;
diff --git a/automation/source/inc/svcommstream.hxx b/automation/source/inc/svcommstream.hxx
index 7a122ba..0245fb9 100644
--- a/automation/source/inc/svcommstream.hxx
+++ b/automation/source/inc/svcommstream.hxx
@@ -26,13 +26,15 @@
*
************************************************************************/
+#include "automation/stsdllapi.h"
+
#include <tools/stream.hxx>
#include <automation/commtypes.hxx>
#include "icommstream.hxx"
-class SvCommStream : public ICommStream
+class STS_DLLPUBLIC SvCommStream : public ICommStream
{
protected:
SvStream* pStream;
diff --git a/automation/source/miniapp/makefile.mk b/automation/source/miniapp/makefile.mk
deleted file mode 100644
index 10c16d8..0000000
--- a/automation/source/miniapp/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=automation
-TARGET=miniapp
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ------------------------------------------------------------
-
-OBJFILES = \
- $(EXCEPTIONSFILES)
-
-
-EXCEPTIONSFILES= \
- $(OBJ)$/editwin.obj \
- $(OBJ)$/servres.obj \
- $(OBJ)$/testapp.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES = \
- servres.src
-
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/automation/source/server/makefile.mk b/automation/source/server/makefile.mk
deleted file mode 100644
index a6e1ec7..0000000
--- a/automation/source/server/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..
-
-PRJNAME=automation
-TARGET=server
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = \
- $(EXCEPTIONSFILES) \
- $(SLO)$/cmdbasestream.obj \
- $(SLO)$/editwin.obj \
- $(SLO)$/retstrm.obj \
- $(SLO)$/scmdstrm.obj \
- $(SLO)$/svcommstream.obj
-
-
-OBJFILES = \
- $(OBJ)$/cmdbasestream.obj \
- $(OBJ)$/svcommstream.obj
-
-EXCEPTIONSFILES = \
- $(SLO)$/XMLParser.obj \
- $(SLO)$/profiler.obj \
- $(SLO)$/recorder.obj \
- $(SLO)$/server.obj \
- $(SLO)$/sta_list.obj \
- $(SLO)$/statemnt.obj
-
-NOOPTFILES = $(SLO)$/statemnt.obj
-
-.IF "$(OS)"=="SOLARIS"
-SLOFILES += $(SLO)$/prof_usl.obj
-.ELSE
-SLOFILES += $(SLO)$/prof_nul.obj
-.ENDIF
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/automation/source/simplecm/makefile.mk b/automation/source/simplecm/makefile.mk
deleted file mode 100644
index b6318ab..0000000
--- a/automation/source/simplecm/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=automation
-TARGET=simplecm
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/tcpio.obj \
- $(SLO)$/packethandler.obj \
- $(SLO)$/simplecm.obj \
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/automation/source/testtool/Makefile b/automation/source/testtool/Makefile
new file mode 100644
index 0000000..f0d1d13
--- /dev/null
+++ b/automation/source/testtool/Makefile
@@ -0,0 +1,57 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+BASEDIR := $(dir $(firstword $(MAKEFILE_LIST)))
+
+define filter_header
+$(1).hxx : $(3)/$(2)
+ $(PERL) $(BASEDIR)/filter.pl $(3) $(2) $(1) $(4)
+
+endef
+
+$(eval $(call filter_header,classes,rcontrol.hxx,$(realpath $(BASEDIR)/../inc),M_))
+$(eval $(call filter_header,keycodes,vcl/keycodes.hxx,$(OUTDIR)/inc,KEY_))
+$(eval $(call filter_header,r_cmds,rcontrol.hxx,$(realpath $(BASEDIR)/../inc),RC_))
+$(eval $(call filter_header,res_type,tools/wintypes.hxx,$(OUTDIR)/inc,WINDOW_))
+
+$(CURDIR)/testtool.ini : $(BASEDIR)/testtool.ini
+ifeq ($(GUI),UNX)
+ sed -e s/!INIFILESUFFIX!/rc/ -e s/!BRANDPATH!// $< > $@
+else ifeq ($(GUI),WNT)
+ sed -e s/!INIFILESUFFIX!/.ini/ -e s/!BRANDPATH!/../ $< > $@
+endif
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : \
+ classes.hxx \
+ keycodes.hxx \
+ r_cmds.hxx \
+ res_type.hxx \
+ $(CURDIR)/testtool.ini
+
+# vim: set ts=4 sw=4 noet:
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
deleted file mode 100644
index d23069e..0000000
--- a/automation/source/testtool/makefile.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=automation
-TARGET=testtool
-
-# --- Settings ------------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ------------------------------------------------------------
-
-OBJFILES = \
- $(EXCEPTIONSFILES) \
- $(OBJ)$/cretstrm.obj \
- $(OBJ)$/httprequest.obj \
-
-
-EXCEPTIONSFILES= \
- $(OBJ)$/cmdstrm.obj \
- $(OBJ)$/comm_bas.obj \
- $(OBJ)$/objtest.obj \
- $(OBJ)$/tcommuni.obj
-
-HXXFILES = $(INCCOM)$/keycodes.hxx \
- $(INCCOM)$/classes.hxx \
- $(INCCOM)$/r_cmds.hxx \
- $(INCCOM)$/res_type.hxx
-
-.IF "$(GUI)" == "WNT"
-OBJFILES += $(OBJ)$/sysdir_win.obj
-OBJFILES += $(OBJ)$/registry_win.obj
-.ENDIF
-# --- Targets ------------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-$(OBJFILES) : $(HXXFILES)
-$(HXXFILES) : $(MISC)$/xfilter.pl
-
-
-$(INCCOM)$/keycodes.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/vcl$/keycodes.hxx \
- $(MISC)$/xfilter.pl
- $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) vcl$/keycodes.hxx $(INCCOM)$/keycodes KEY_
-
-$(INCCOM)$/classes.hxx : ..$/inc$/rcontrol.hxx \
- $(MISC)$/xfilter.pl
- $(PERL) $(MISC)$/xfilter.pl ..$/inc rcontrol.hxx $(INCCOM)$/classes M_
-
-$(INCCOM)$/r_cmds.hxx : ..$/inc$/rcontrol.hxx \
- $(MISC)$/xfilter.pl
- $(PERL) $(MISC)$/xfilter.pl ..$/inc rcontrol.hxx $(INCCOM)$/r_cmds RC_
-
-$(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/wintypes.hxx \
- $(MISC)$/xfilter.pl
- $(PERL) $(MISC)$/xfilter.pl $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT) tools$/wintypes.hxx $(INCCOM)$/res_type WINDOW_
-
-
-
-$(MISC)$/xfilter.pl : filter.pl
- tr -d "\015" < filter.pl > $(MISC)$/xfilter.pl
- chmod 664 $(MISC)$/xfilter.pl
-
-
-
-.IF "$(GUI)"=="UNX"
-INIFILESUFFIX=rc
-BRANDPATH=none
-.ELIF "$(GUI)"=="WNT"
-INIFILESUFFIX=.ini
-BRANDPATH=..
-.END
-
-$(BIN)$/testtool$(INIFILESUFFIX): testtool.ini
- $(SED) -e s/$(EMQ)!INIFILESUFFIX$(EMQ)!/$(INIFILESUFFIX)/ \
- -e s/$(EMQ)!BRANDPATH$(EMQ)!/$(BRANDPATH)/ < $< > $@
-
-ALLTAR: \
- $(BIN)$/testtool$(INIFILESUFFIX)
-
diff --git a/automation/util/makefile.mk b/automation/util/makefile.mk
deleted file mode 100644
index fbbe474..0000000
--- a/automation/util/makefile.mk
+++ /dev/null
@@ -1,278 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=automation
-TARGET=automation
-TARGETTYPE=GUI
-
-# --- Settings ---------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Allgemein ---------------------------------------------------
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES= \
- $(SLB)$/server.lib \
- $(SLB)$/simplecm.lib \
- $(SLB)$/communi.lib
-
-# --- sts library ---------------------------------------------------
-
-SHL1TARGET= sts$(DLLPOSTFIX)
-SHL1IMPLIB= ists
-
-SHL1STDLIBS= \
- $(BASICLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(SOTLIB) \
- $(SVLLIB) \
- $(SVTLIB) \
- $(SVTOOLLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(VCLLIB) \
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+= \
- $(ADVAPI32LIB) \
- $(GDI32LIB)
-.ENDIF
-
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-
-DEF1NAME =$(SHL1TARGET)
-DEF1DEPN = \
- $(MISC)$/$(SHL1TARGET).flt
-
-DEFLIB1NAME =$(TARGET)
-DEF1DES =TestToolServer
-
-# --- simple communication library (no vcl) ---------------------------------------------------
-
-SHL2TARGET= simplecm$(DLLPOSTFIX)
-SHL2IMPLIB= isimplecm
-
-SHL2STDLIBS= \
- $(TOOLSLIB) \
- $(SALLIB)
-
-
-SHL2DEF= $(MISC)$/$(SHL2TARGET).def
-SHL2LIBS= $(SLB)$/simplecm.lib
-
-DEF2NAME =$(SHL2TARGET)
-DEF2DEPN = \
- $(MISC)$/$(SHL2TARGET).flt
-
-DEFLIB2NAME =simplecm
-DEF2DES =SimpleCommunication
-
-# --- communication library ---------------------------------------------------
-
-SHL3TARGET= communi$(DLLPOSTFIX)
-SHL3IMPLIB= icommuni
-
-SHL3STDLIBS= \
- $(TOOLSLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(SALLIB) \
- $(SIMPLECMLIB)
-
-
-.IF "$(GUI)"=="WNT"
-SHL3STDLIBS+= \
- $(ADVAPI32LIB) \
- $(GDI32LIB)
-.ENDIF
-
-SHL3DEF= $(MISC)$/$(SHL3TARGET).def
-SHL3LIBS= $(SLB)$/communi.lib
-SHL3DEPN=$(SHL2TARGETN)
-
-DEF3NAME =$(SHL3TARGET)
-DEF3DEPN = \
- $(MISC)$/$(SHL3TARGET).flt
-
-DEFLIB3NAME =communi
-DEF3DES =Communication
-
-# --- TESTTOOL IDE ------------------------------------------------------
-
-APP1TARGET=testtool
-
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-APP1DEPN+=$(SHL2TARGETN) $(SHL3TARGETN)
-.ELSE
-APP1DEPN+=$(SHL2IMPLIBN) $(SHL3IMPLIBN)
-.ENDIF
-APP1STDLIBS= \
- $(APP3RDLIB) \
- $(SAMPLE3RDLIB)
-
-APP1STDLIBS+= \
- $(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(SALLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(BASICLIB) \
- $(SIMPLECMLIB) \
- $(COMMUNILIB)
-
-.IF "$(GUI)"=="UNX"
-APP1STDLIBS+= \
- $(SALLIB) $(BASICLIB)
-APP1STDLIBS+=$(CPPULIB)
-.ENDIF
-.IF "$(GUI)"=="WNT" || "$(COM)"=="GCC"
-APP1STDLIBS+=$(CPPULIB)
-.ENDIF
-
-.IF "$(GUI)"=="WNT"
-APP1STDLIBS += \
- $(SHELL32LIB) \
- $(ADVAPI32LIB)
-.ENDIF # "$(GUI)"=="WNT"
-
-
-
-.IF "$(OS)" == "SOLARIS"
-APP1STDLIBS+= -lXm
-.ENDIF
-
-.IF "$(GUI)" == "UNX"
-.IF "$(OS)" == "LINUX"
-APP1STDLIBS+= -lXext -lX11 -lSM -lICE
-.ENDIF
-.IF "$(OS)"=="MACOSX"
-APP1STDLIBS+= -lapp -lsample
-.ENDIF
-.ENDIF
-
-
-
-APP1LIBS=\
- $(LB)$/testtool.lib
-
-APP1OBJS= $(OBJ)$/testbasi.obj \
- $(OBJ)$/cmdbasestream.obj \
- $(OBJ)$/svcommstream.obj
-
-# --- TESTTOOL MINIAPP ------------------------------------------------------
-# ressources are linked here
-
-RESLIB1NAME=tma
-RESLIB1SRSFILES= \
- $(SRS)$/miniapp.srs
-
-APP3TARGET=miniapp
-APP3STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(AUTOMATIONLIB) \
- $(SALLIB) \
- $(TOOLSLIB) \
- $(SVTOOLLIB) \
- $(VCLLIB)
-
-.IF "$(GUI)"=="UNX"
-APP3STDLIBS+= \
- $(SALLIB)
-.ENDIF
-# $(AUTOMATIONLIB) is build in SHL1TARGET
-.IF "$(GUI)"=="UNX" || ("$(COM)"=="GCC" && "$(GUI)"=="WNT")
-APP3DEPN=$(SHL1TARGETN)
-.ELSE
-APP3DEPN=$(SHL1IMPLIBN)
-.ENDIF
-
-APP3LIBS= \
- $(LB)$/miniapp.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-# win16 braucht ein appobj
-APP3OBJS= $(OBJ)$/testapp.obj
-.ENDIF
-.ENDIF
-
-# --- Targets -----------------------------------------------------------
-
-.INCLUDE : target.mk
-
-# --- Basic-Filter-Datei ---
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo Making: $@
- @echo WEP > $@
- @echo LIBMAIN >> $@
- @echo LibMain >> $@
- @echo Sbi >> $@
- @echo exception >> $@
- @echo bad_alloc >> $@
- @echo __CT >> $@
-
-$(MISC)$/$(SHL2TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo Making: $@
- @echo WEP > $@
- @echo LIBMAIN >> $@
- @echo LibMain >> $@
- @echo Sbi >> $@
- @echo exception >> $@
- @echo bad_alloc >> $@
- @echo __CT >> $@
-
-$(MISC)$/$(SHL3TARGET).flt: makefile.mk
- @echo ------------------------------
- @echo Making: $@
- @echo WEP > $@
- @echo LIBMAIN >> $@
- @echo LibMain >> $@
- @echo Sbi >> $@
- @echo exception >> $@
- @echo bad_alloc >> $@
- @echo __CT >> $@
-
-
-# ------------------------------------------------------------------------
-
diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp
index 3b30c15..4592f1d 100644
--- a/scp2/source/testtool/file_testtool.scp
+++ b/scp2/source/testtool/file_testtool.scp
@@ -30,20 +30,15 @@
STD_LIB_FILE( gid_File_Lib_Communi, communi )
STD_LIB_FILE( gid_File_Lib_Simplecm, simplecm )
-#if defined WNT
-File gid_File_Exe_Testtool
+File gid_File_Bin_Testtool
BIN_FILE_BODY;
Dir = gid_Dir_Program;
Styles = (PACKED);
+#if defined WNT
Name = "testtool.exe";
-End
+#else
+ Name = "testtool";
#endif
-
-File gid_File_Bin_Testtool
- BIN_FILE_BODY;
- Dir = gid_Dir_Program;
- Styles = (PACKED);
- Name = "testtool.bin";
End
File gid_File_Config_Testtool
@@ -66,6 +61,6 @@ Unixlink gid_Unixlink_Testtool
Styles = ();
Name = "testtool";
Dir = gid_Brand_Dir_Program;
- Target = "../basis-link/program/testtool.bin";
+ Target = "../basis-link/program/testtool";
End
#endif
diff --git a/scp2/source/testtool/module_testtool.scp b/scp2/source/testtool/module_testtool.scp
index 1a6bc0d..a608d91 100644
--- a/scp2/source/testtool/module_testtool.scp
+++ b/scp2/source/testtool/module_testtool.scp
@@ -33,6 +33,6 @@ Module gid_Module_Optional_Testtool
Sortkey = "650";
ParentID = gid_Module_Optional;
Default = NO;
- Files = (gid_File_Exe_Testtool, gid_File_Bin_Testtool, gid_File_Lib_Communi, gid_File_Lib_Simplecm, gid_File_Hid_Testtool, gid_File_Config_Testtool);
+ Files = (gid_File_Bin_Testtool, gid_File_Lib_Communi, gid_File_Lib_Simplecm, gid_File_Hid_Testtool, gid_File_Config_Testtool);
Unixlinks = (gid_Unixlink_Testtool);
End
commit 6c8a7e0e6ad223051442ef6ce1d1103086c3f4a0
Author: David Tardon <dtardon at redhat.com>
Date: Wed Sep 14 10:48:42 2011 +0200
pass -s flag to custom target's make process
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 2b5b681..a79ed8d 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -32,7 +32,7 @@ gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
- $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
+ $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< $(if $(findstring s,$(MAKEFLAGS)),-s) && \
touch $(1))
endef
commit a3c3d709a8708a5c902648707d6db7614843a923
Author: David Tardon <dtardon at redhat.com>
Date: Wed Sep 14 10:48:41 2011 +0200
be silent
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 24bca5c..70823c5 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -64,7 +64,7 @@ my $id_str = ' $Revision: 1.17 $ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
-print "$script_name -- version: $script_rev\n";
+print "$script_name -- version: $script_rev\n" if $verbose;
#### main #####
@@ -83,9 +83,9 @@ $do_rebuild = is_file_newer($zip_hash_ref) if $do_rebuild == 0;
if ( $do_rebuild == 1 ) {
create_zip_archive($zip_hash_ref);
replace_file($tmp_out_file, $out_file);
- print_message("packing $out_file finished.");
+ print_message("packing $out_file finished.") if $verbose;
} else {
- print_message("$out_file up to date. nothing to do.");
+ print_message("$out_file up to date. nothing to do.") if $verbose;
}
exit(0);
commit c79e42d225f2108a1acb0e88820f4fa535c2d8dd
Author: David Tardon <dtardon at redhat.com>
Date: Wed Sep 14 10:48:40 2011 +0200
be silent
diff --git a/automation/source/testtool/filter.pl b/automation/source/testtool/filter.pl
index 8f45073..825c379 100644
--- a/automation/source/testtool/filter.pl
+++ b/automation/source/testtool/filter.pl
@@ -103,7 +103,7 @@ $outfilebase = $ARGV[2] if defined($ARGV[2]);
$namefilter = $ARGV[3] if defined($ARGV[3]);
-print "Generating $outfilebase:\n";
+print "Generating $outfilebase:\n" if $debug;
$count = 0;
commit c40f63454da9ce7276c523317e2dc73aa34b7121
Author: David Tardon <dtardon at redhat.com>
Date: Tue Sep 13 15:03:17 2011 +0200
work silently for make -s
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index f411ce7..a96ff6b 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -30,7 +30,7 @@
gb_Zip__get_preparation_target = $(WORKDIR)/Zip/$(1).prepare
-gb_Zip_ZIPCOMMAND := zip
+gb_Zip_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
# remove zip file in workdir and outdir
$(call gb_Zip_get_clean_target,%) :
commit 37356b7b2ae6ecdcef9908ae37c9b729c177f9d7
Author: David Tardon <dtardon at redhat.com>
Date: Tue Sep 13 15:03:15 2011 +0200
allow to specify additional deps for zip target
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 6961140..f411ce7 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -28,6 +28,8 @@
# Zip class
+gb_Zip__get_preparation_target = $(WORKDIR)/Zip/$(1).prepare
+
gb_Zip_ZIPCOMMAND := zip
# remove zip file in workdir and outdir
@@ -35,6 +37,7 @@ $(call gb_Zip_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),ZIP,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Zip_get_target,$*) && \
+ rm -f $(call gb_Zip_get__preparation_target,$*) && \
rm -f $(call gb_Zip_get_final_target,$*) && \
rm -f $(call gb_Zip_get_outdir_target,$*))
@@ -52,6 +55,12 @@ $(call gb_Zip_get_target,%) :
$(call gb_Zip_get_final_target,%) : $(call gb_Zip_get_outdir_target,%)
touch $@
+# the preparation target is here to ensure proper ordering of actions in cases
+# when we want to, e.g., create a zip from files created by a custom target
+$(call gb_Zip__get_preparation_target,%) :
+ $(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $@) && touch $@)
+
# clear file list, set location (zipping uses relative paths)
# register target and clean target
# add deliverable
@@ -75,6 +84,13 @@ endef
define gb_Zip_add_file
$(call gb_Zip_get_target,$(1)) : FILES += $(2)
$(call gb_Zip_get_target,$(1)) : $(gb_Package_Location_$(1))/$(2)
+$(gb_Package_Location_$(1))/$(2) :| $(call gb_Zip__get_preparation_target,$(1))
+
+endef
+
+# add additional dependency that must exist before the archive can be created
+define gb_Zip_add_dependency
+$(call gb_Zip__get_preparation_target,$(1)) :| $(2)
endef
@@ -82,4 +98,9 @@ define gb_Zip_add_files
$(foreach file,$(2),$(call gb_Zip_add_file,$(1),$(file)))
endef
+define gb_Zip_add_dependencies
+$(foreach dependency,$(2),$(call gb_Zip_add_dependency,$(1),$(dependency)))
+
+endef
+
# vim: set noet sw=4 ts=4:
commit 0510c98c5aaa04156981da48381d4a704ac55558
Author: David Tardon <dtardon at redhat.com>
Date: Sun Aug 28 14:51:03 2011 +0200
WaE: declaration of 'index' shadows a global declaration
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index e2a3b2a..56efe95 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -478,12 +478,12 @@ send_args( int fd, rtl_uString *pCwdPath )
const char* schemes[] = { "slot:", ".uno:", "vnd.sun.star.script:" };
sal_Bool bIsSpecialURL = sal_False;
- int index = 0;
+ int i = 0;
int len = SAL_N_ELEMENTS(schemes);
- for ( ; index < len; ++index )
+ for ( ; i < len; ++i )
{
if ( rtl_ustr_indexOfAscii_WithLength( pTmp->buffer
- , pTmp->length , schemes[ index ], strlen(schemes[ index ] )) == 0 )
+ , pTmp->length , schemes[ i ], strlen(schemes[ i ] )) == 0 )
{
bIsSpecialURL = sal_True;
break;
commit b2d9db45499891a2dc8c4a7010f7812fa9348290
Author: David Tardon <dtardon at redhat.com>
Date: Sun Aug 28 14:50:27 2011 +0200
WaE: declaration of 'i' shadows a previous local
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 76ef3eb..c1a1ba6 100755
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -520,13 +520,13 @@ int splash_create_window( int argc, char** argv )
XineramaScreenInfo* p_screens = XineramaQueryScreens( display, &n_xinerama_screens );
if( p_screens )
{
- int i = 0;
- for( ; i < n_xinerama_screens; i++ )
+ int j = 0;
+ for( ; j < n_xinerama_screens; j++ )
{
- if ( p_screens[i].screen_number == screen )
+ if ( p_screens[j].screen_number == screen )
{
- display_width = p_screens[i].width;
- display_height = p_screens[i].height;
+ display_width = p_screens[j].width;
+ display_height = p_screens[j].height;
break;
}
}
commit 30bf29f428fe075722e21088ed8022c0f9b09615
Author: David Tardon <dtardon at redhat.com>
Date: Sun Aug 28 14:49:57 2011 +0200
WaE: declaration of 'j' shadows a previous local
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index d69fe62..367bac2 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -112,7 +112,6 @@ Args *args_parse (void)
for ( i = args->nArgsEnv; i < args->nArgsTotal; i++ )
{
- sal_uInt32 j;
const sal_Unicode *arg = args->ppArgs[i]->buffer;
sal_Int32 length = args->ppArgs[i]->length;
More information about the Libreoffice-commits
mailing list