gridsort: post rebase (which was implicitly done by merging CWS dba34b): re-do changes in the new build system
This commit is contained in:
Frank Schoenheit [fs]
parent
ea2edeee01
commit
54d9ea315a
5 changed files with 97 additions and 3 deletions
|
|
@ -250,6 +250,8 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
|
|||
svtools/source/table/tablecontrol \
|
||||
svtools/source/table/tablecontrol_impl \
|
||||
svtools/source/table/tabledatawindow \
|
||||
svtools/source/table/mousefunction \
|
||||
svtools/source/table/cellvalueconversion \
|
||||
svtools/source/table/tablegeometry \
|
||||
svtools/source/toolpanel/drawerlayouter \
|
||||
svtools/source/toolpanel/dummypanel \
|
||||
|
|
@ -278,6 +280,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
|
|||
svtools/source/uno/toolboxcontroller \
|
||||
svtools/source/uno/treecontrolpeer \
|
||||
svtools/source/uno/unocontroltablemodel \
|
||||
svtools/source/uno/unogridcolumnfacade \
|
||||
svtools/source/uno/unoevent \
|
||||
svtools/source/uno/unoiface \
|
||||
svtools/source/uno/unoimap \
|
||||
|
|
|
|||
|
|
@ -146,15 +146,15 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svx
|
|||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/sychconv.hxx,svtools/sychconv.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/abstracttablecontrol.hxx,svtools/table/abstracttablecontrol.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrolinterface.hxx,svtools/table/tablecontrolinterface.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/defaultinputhandler.hxx,svtools/table/defaultinputhandler.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/gridtablerenderer.hxx,svtools/table/gridtablerenderer.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrol.hxx,svtools/table/tablecontrol.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabledatawindow.hxx,svtools/table/tabledatawindow.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tableinputhandler.hxx,svtools/table/tableinputhandler.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablemodel.hxx,svtools/table/tablemodel.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablerenderer.hxx,svtools/table/tablerenderer.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tabletypes.hxx,svtools/table/tabletypes.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/table/tablesort.hxx,svtools/table/tablesort.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/taskbar.hxx,svtools/taskbar.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templatefoldercache.hxx,svtools/templatefoldercache.hxx))
|
||||
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/templdlg.hxx,svtools/templdlg.hxx))
|
||||
|
|
|
|||
|
|
@ -98,6 +98,8 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
|
|||
toolkit/source/controls/grid/defaultgridcolumnmodel \
|
||||
toolkit/source/controls/grid/defaultgriddatamodel \
|
||||
toolkit/source/controls/grid/gridcolumn \
|
||||
toolkit/source/controls/grid/grideventforwarder \
|
||||
toolkit/source/controls/grid/sortablegriddatamodel \
|
||||
toolkit/source/controls/grid/gridcontrol \
|
||||
toolkit/source/controls/roadmapcontrol \
|
||||
toolkit/source/controls/roadmapentry \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
ti toolkit : LIBXSLT:libxslt vcl qadevOOo NULL
|
||||
ti toolkit : LIBXSLT:libxslt vcl qadevOOo test NULL
|
||||
ti toolkit\prj nmake - all ti_prj NULL
|
||||
ti toolkit\qa\complex\toolkit nmake - all ti_complex_toolkit NULL
|
||||
|
|
|
|||
89
toolkit/qa/complex/toolkit/makefile.mk
Executable file
89
toolkit/qa/complex/toolkit/makefile.mk
Executable file
|
|
@ -0,0 +1,89 @@
|
|||
#*************************************************************************
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
.IF "$(OOO_JUNIT_JAR)" == ""
|
||||
nothing .PHONY:
|
||||
@echo -----------------------------------------------------
|
||||
@echo - JUnit not available, not building anything
|
||||
@echo -----------------------------------------------------
|
||||
.ELSE # IF "$(OOO_JUNIT_JAR)" != ""
|
||||
|
||||
PRJ = ../../..
|
||||
PRJNAME = toolkit
|
||||
TARGET = qa_complex_toolkit
|
||||
PACKAGE = complex/toolkit
|
||||
|
||||
# --- Settings -----------------------------------------------------
|
||||
.INCLUDE: settings.mk
|
||||
|
||||
#----- compile .java files -----------------------------------------
|
||||
|
||||
JARFILES = OOoRunnerLight.jar ridl.jar test.jar unoil.jar
|
||||
EXTRAJARFILES = $(OOO_JUNIT_JAR)
|
||||
|
||||
JAVAFILES = \
|
||||
$(JAVATESTFILES) \
|
||||
accessibility/_XAccessibleComponent.java \
|
||||
accessibility/_XAccessibleContext.java \
|
||||
accessibility/_XAccessibleEventBroadcaster.java \
|
||||
accessibility/_XAccessibleExtendedComponent.java \
|
||||
accessibility/_XAccessibleText.java \
|
||||
|
||||
#----- create a jar from compiled files ----------------------------
|
||||
|
||||
JARTARGET = $(TARGET).jar
|
||||
|
||||
#----- JUnit tests class -------------------------------------------
|
||||
|
||||
JAVATESTFILES = \
|
||||
UnitConversion.java \
|
||||
AccessibleStatusBar.java \
|
||||
|
||||
# fails; no issue, yet (not sure this is worth it. Don't know who to give the issue to, and don't know whether the test really makes sense)
|
||||
# AccessibleStatusBarItem.java \
|
||||
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
||||
.INCLUDE: target.mk
|
||||
|
||||
ALL : ALLTAR
|
||||
|
||||
# --- subsequent tests ---------------------------------------------
|
||||
|
||||
.IF "$(OOO_SUBSEQUENT_TESTS)" != ""
|
||||
|
||||
.INCLUDE: installationtest.mk
|
||||
|
||||
ALLTAR : javatest
|
||||
|
||||
# Sample how to debug
|
||||
# JAVAIFLAGS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y
|
||||
|
||||
.END # "$(OOO_SUBSEQUENT_TESTS)" == ""
|
||||
|
||||
.END # ELSE "$(OOO_JUNIT_JAR)" != ""
|
||||
Loading…
Reference in a new issue