[REVIEW] smoketest -> gbuild, TestExtension.idl needed ?

On 12 February 2012 23:51, Matúš Kukan <matus.kukan@gmail.com> wrote:
> Do not push them without improvement, make check fails for me.
> Attached diff solves one problem but still there is something wrong.

Well, I was fooled by smoketest/com/sun/star/comp/smoketest/makefile.mk
There is javamaker involved, but the produced .class file does not end
up in TestExtension.jar
So the call to javamaker it's pointless ..whatever.

Then I also tried to remove TestExtension.rdb from TestExtension.oxt
and make check was also successful.
So, can I remove TestExtension.idl file ? Anybody has opinion about this ?

I'd like to push attached patch. Hopefully it will work also for
others and there is nothing wrong with removing TestExtension.rdb from
TestExtension.oxt.

(I will push myself with others if it is ok)

Matus

From cec413519035eaee1ed6a18460c37fd27b1ac050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Sun, 12 Feb 2012 13:39:52 +0100
Subject: [PATCH] smoketest: convert to gbuild

---
 Makefile                                           |    2 +-
 Repository.mk                                      |    1 +
 RepositoryModule_ooo.mk                            |    1 +
 smoketest/Jar_TestExtension.mk                     |   52 ++++++++++++
 smoketest/Library_smoketest.mk                     |   50 +++++++++++
 smoketest/Makefile                                 |    7 ++
 smoketest/Module_smoketest.mk                      |   43 ++++++++++
 smoketest/Package_losmoketest.mk                   |   32 +++++++
 smoketest/Zip_TestExtension.mk                     |   48 +++++++++++
 smoketest/Zip_smoketestdoc.mk                      |   69 +++++++++++++++
 .../com/sun/star/comp/smoketest/TestExtension.idl  |   40 ---------
 smoketest/com/sun/star/comp/smoketest/delzip       |    1 -
 smoketest/com/sun/star/comp/smoketest/makefile.mk  |   88 --------------------
 smoketest/com/sun/star/comp/smoketest/manifest.xml |    1 -
 smoketest/data/makefile.mk                         |   70 ----------------
 smoketest/makefile.mk                              |   49 -----------
 smoketest/prj/build.lst                            |    4 +-
 smoketest/prj/d.lst                                |    4 -
 smoketest/prj/makefile.mk                          |    1 +
 19 files changed, 306 insertions(+), 257 deletions(-)
 create mode 100644 smoketest/Jar_TestExtension.mk
 create mode 100644 smoketest/Library_smoketest.mk
 create mode 100644 smoketest/Makefile
 create mode 100644 smoketest/Module_smoketest.mk
 create mode 100644 smoketest/Package_losmoketest.mk
 create mode 100644 smoketest/Zip_TestExtension.mk
 create mode 100644 smoketest/Zip_smoketestdoc.mk
 delete mode 100644 smoketest/com/sun/star/comp/smoketest/TestExtension.idl
 delete mode 100755 smoketest/com/sun/star/comp/smoketest/delzip
 delete mode 100755 smoketest/com/sun/star/comp/smoketest/makefile.mk
 delete mode 100644 smoketest/data/makefile.mk
 delete mode 100755 smoketest/makefile.mk
 create mode 100644 smoketest/prj/makefile.mk

diff --git a/Makefile b/Makefile
index 815959f..597a359 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,7 @@ scripting\
 sd\
 sfx2\
 slideshow\
+smoketest\
 sot\
 starmath\
 svl\
@@ -218,7 +219,6 @@ scp2\
 sdext\
 setup_native\
 shell\
-smoketest\
 smoketestoo_native\
 solenv\
 soltools\
diff --git a/Repository.mk b/Repository.mk
index 5adc794..1bc6fd8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -341,6 +341,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     package2 \
     reg \
     scriptframe \
+    smoketest \
     sofficeapp \
     srtrs1 \
     store \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 8020878..6d724c1 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     sd \
     sfx2 \
     slideshow \
+    smoketest \
     sot \
     starmath \
     svl \
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
new file mode 100644
index 0000000..8276cc5
--- /dev/null
+++ b/smoketest/Jar_TestExtension.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2012 Matúš Kukan <matus.kukan@gmail.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_Jar_Jar,TestExtension))
+
+$(eval $(call 
gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,TestExtension,\
+       juh.jar \
+       jurt.jar \
+       ridl.jar \
+       unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,TestExtension,\
+       $(OUTDIR)/bin/juh.jar \
+       $(OUTDIR)/bin/jurt.jar \
+       $(OUTDIR)/bin/ridl.jar \
+       $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,TestExtension,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,TestExtension,\
+       smoketest/com/sun/star/comp/smoketest/TestExtension \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk
new file mode 100644
index 0000000..aedb9bc
--- /dev/null
+++ b/smoketest/Library_smoketest.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2012 Matúš Kukan <matus.kukan@gmail.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,smoketest))
+
+$(eval $(call gb_Library_add_api,smoketest,\
+       udkapi \
+       offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,smoketest,\
+       cppu \
+       cppuhelper \
+       sal \
+       unotest \
+))
+
+$(eval $(call gb_Library_use_externals,smoketest,\
+       cppunit \
+))
+
+$(eval $(call gb_Library_add_exception_objects,smoketest,\
+       smoketest/smoketest \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Makefile b/smoketest/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/smoketest/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
new file mode 100644
index 0000000..1f2d0bf
--- /dev/null
+++ b/smoketest/Module_smoketest.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2012 Matúš Kukan <matus.kukan@gmail.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,smoketest))
+
+$(eval $(call gb_Module_add_targets,smoketest,\
+       Library_smoketest \
+       Package_losmoketest \
+       Zip_smoketestdoc \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,smoketest,\
+       Jar_TestExtension \
+       Zip_TestExtension \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Package_losmoketest.mk b/smoketest/Package_losmoketest.mk
new file mode 100644
index 0000000..b8dfba5
--- /dev/null
+++ b/smoketest/Package_losmoketest.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2012 Matúš Kukan <matus.kukan@gmail.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,smoketest_losmoketest,$(SRCDIR)/smoketest))
+
+$(eval $(call gb_Package_add_file,smoketest_losmoketest,bin/losmoketest,losmoketest))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Zip_TestExtension.mk b/smoketest/Zip_TestExtension.mk
new file mode 100644
index 0000000..b332f43
--- /dev/null
+++ b/smoketest/Zip_TestExtension.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2012 Matúš Kukan <matus.kukan@gmail.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_Zip_Zip,TestExtension,$(WORKDIR)/Zip/TestExtension))
+
+$(eval $(call gb_Zip_add_file,TestExtension,TestExtension.jar,\
+       $(call gb_Jar_get_outdir_target,TestExtension) \
+))
+
+$(eval $(call gb_Zip_add_file,TestExtension,META-INF/manifest.xml,\
+       $(SRCDIR)/smoketest/com/sun/star/comp/smoketest/manifest.xml \
+))
+
+$(call gb_Zip_get_final_target,TestExtension) : $(OUTDIR)/bin/TestExtension.oxt
+$(call gb_Zip_get_clean_target,TestExtension) : Clean_TestExtension_oxt
+
+$(OUTDIR)/bin/TestExtension.oxt : $(call gb_Zip_get_target,TestExtension)
+       $(call gb_Deliver_deliver,$<,$@)
+
+.PHONY : Clean_TestExtension_oxt
+Clean_TestExtension_oxt :
+       rm -f $(OUTDIR)/bin/TestExtension.oxt
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Zip_smoketestdoc.mk b/smoketest/Zip_smoketestdoc.mk
new file mode 100644
index 0000000..c27d326
--- /dev/null
+++ b/smoketest/Zip_smoketestdoc.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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) 2012 Matúš Kukan <matus.kukan@gmail.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.
+
+SMOKETESTDOC_DIR:=$(SRCDIR)/smoketest/data
+
+$(eval $(call gb_Zip_Zip,smoketestdoc,$(WORKDIR)/Zip/smoketestdoc))
+
+$(eval $(call gb_Zip_add_commandoptions,smoketestdoc,-D))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,mimetype))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,content.xml,$(SMOKETESTDOC_DIR)/content.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,meta.xml,$(SMOKETESTDOC_DIR)/meta.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,settings.xml,$(SMOKETESTDOC_DIR)/settings.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,styles.xml,$(SMOKETESTDOC_DIR)/styles.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,META-INF/manifest.xml,$(SMOKETESTDOC_DIR)/manifest.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/script-lc.xml,$(SMOKETESTDOC_DIR)/script-lc.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Basic/Standard/script-lb.xml,$(SMOKETESTDOC_DIR)/script-lb.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Basic/Standard/Events.xml,$(SMOKETESTDOC_DIR)/Events.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Basic/Standard/Global.xml,$(SMOKETESTDOC_DIR)/Global.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_10er.xml,$(SMOKETESTDOC_DIR)/Test_10er.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_DB.xml,$(SMOKETESTDOC_DIR)/Test_DB.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_Ext.xml,$(SMOKETESTDOC_DIR)/Test_Ext.xml))
+
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml,$(SMOKETESTDOC_DIR)/dialog-lc.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml,$(SMOKETESTDOC_DIR)/dialog-lb.xml))
+$(eval $(call 
gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml,$(SMOKETESTDOC_DIR)/OptionsDlg.xml))
+
+$(WORKDIR)/Zip/smoketestdoc/mimetype :
+       mkdir -p $(dir $@)
+       printf application/vnd.sun.xml.writer > $@
+
+$(call gb_Zip_get_final_target,smoketestdoc) : $(OUTDIR)/bin/smoketestdoc.sxw
+$(call gb_Zip_get_clean_target,smoketestdoc) : Clean_smoketestdoc_sxw
+
+$(OUTDIR)/bin/smoketestdoc.sxw : $(call gb_Zip_get_target,smoketestdoc)
+       $(call gb_Deliver_deliver,$<,$@)
+
+.PHONY : Clean_smoketestdoc_sxw
+Clean_smoketestdoc_sxw :
+       rm -f $(OUTDIR)/bin/smoketestdoc.sxw
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.idl 
b/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
deleted file mode 100644
index 83c370e..0000000
--- a/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
+++ /dev/null
@@ -1,40 +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.
- *
- ************************************************************************/
-
-#ifndef _com_sun_star_comp_smoketest_TestExtension_idl_
-#define _com_sun_star_comp_smoketest_TestExtension_idl_
-
-#include <com/sun/star/lang/XServiceInfo.idl>
-
-
-module com { module sun { module star { module comp { module smoketest {
-        // example service, XServiceInfo is implemented here for demonstration
-        // issues. XServiceInfo must be implemented by all components.
-        service TestExtension: ::com::sun::star::lang::XServiceInfo;
-};};};};};
-
-#endif
diff --git a/smoketest/com/sun/star/comp/smoketest/delzip 
b/smoketest/com/sun/star/comp/smoketest/delzip
deleted file mode 100755
index 636fda9..0000000
--- a/smoketest/com/sun/star/comp/smoketest/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/smoketest/com/sun/star/comp/smoketest/makefile.mk 
b/smoketest/com/sun/star/comp/smoketest/makefile.mk
deleted file mode 100755
index 88e5370..0000000
--- a/smoketest/com/sun/star/comp/smoketest/makefile.mk
+++ /dev/null
@@ -1,88 +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 = smoketestdoc
-PACKAGE = com/sun/star/comp/smoketest
-TARGET  = com_sun_star_comp_smoketest
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(SOLAR_JAVA)" != ""
-
-.INCLUDE : settings.mk
-
-JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
-
-JARTARGET          = TestExtension.jar
-JARCOMPRESS        = TRUE
-CUSTOMMANIFESTFILE = MANIFEST.MF
-
-ZIP1TARGET=TestExtension
-ZIP1LIST=*
-ZIPFLAGS=-r
-ZIP1DIR=$(MISC)/$(TARGET)
-ZIP1EXT=.oxt
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = TestExtension.java
-
-# --- Targets ------------------------------------------------------
-
-ZIP1DEPS=$(MISC)/$(TARGET)/$(JARTARGET)\
-         $(MISC)/$(TARGET)/TestExtension.rdb\
-         $(MISC)/$(TARGET)/META-INF/manifest.xml
-
-.INCLUDE :  target.mk
-
-.IF "$(depend)" == ""
-$(MISC)/$(TARGET)/META-INF:
-    @-$(MKDIRHIER) $(@)
-
-$(MISC)/TestExtension.urd: TestExtension.idl
-    $(COMMAND_ECHO)$(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $<
-
-$(MISC)/$(TARGET)/META-INF/manifest.xml $(MISC)/$(TARGET)/TestExtension.rdb : 
$(MISC)/$(TARGET)/META-INF
-
-$(MISC)/$(TARGET)/META-INF/manifest.xml: manifest.xml
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-$(MISC)/$(TARGET)/TestExtension.rdb: $(MISC)/TestExtension.urd
-    $(COMMAND_ECHO)$(REGMERGE) $@ /UCR $<
-
-$(JAVACLASSFILES) .UPDATEALL: $(MISC)/$(TARGET)/TestExtension.rdb
-    $(COMMAND_ECHO)$(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
-
-$(MISC)/$(TARGET)/$(JARTARGET) : $(JARTARGETN)
-    $(COMMAND_ECHO)$(COPY) $< $@
-.END
-
-.ELSE
-@all:
-    @echo "Java disabled. Nothing to do."
-.ENDIF
diff --git a/smoketest/com/sun/star/comp/smoketest/manifest.xml 
b/smoketest/com/sun/star/comp/smoketest/manifest.xml
index fcedabf..0e73044 100755
--- a/smoketest/com/sun/star/comp/smoketest/manifest.xml
+++ b/smoketest/com/sun/star/comp/smoketest/manifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest";>
  <manifest:file-entry manifest:full-path="TestExtension.jar" 
manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
- <manifest:file-entry manifest:full-path="TestExtension.rdb" 
manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
 </manifest:manifest>
diff --git a/smoketest/data/makefile.mk b/smoketest/data/makefile.mk
deleted file mode 100644
index 6cf2706..0000000
--- a/smoketest/data/makefile.mk
+++ /dev/null
@@ -1,70 +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 = smoketestdoc
-TARGET = data
-
-.INCLUDE: settings.mk
-
-$(BIN)/smoketestdoc.sxw: $(MISC)/zip/smoketestdoc.sxw
-    $(COPY) $< $@
-
-$(MISC)/zip/smoketestdoc.sxw: \
-        Events.xml \
-        Global.xml \
-        OptionsDlg.xml \
-        Test_10er.xml \
-        Test_DB.xml \
-        Test_Ext.xml \
-        content.xml \
-        dialog-lb.xml \
-        dialog-lc.xml \
-        manifest.xml \
-        meta.xml \
-        script-lb.xml \
-        script-lc.xml \
-        settings.xml \
-        styles.xml
-    $(COMMAND_ECHO)$(RM) -r $(MISC)/zip
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip
-    $(COMMAND_ECHO)$(COPY) content.xml meta.xml settings.xml styles.xml $(MISC)/zip/
-    $(COMMAND_ECHO)printf application/vnd.sun.xml.writer > $(MISC)/zip/mimetype
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/META-INF
-    $(COMMAND_ECHO)$(COPY) manifest.xml $(MISC)/zip/META-INF/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic
-    $(COMMAND_ECHO)$(COPY) script-lc.xml $(MISC)/zip/Basic/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic/Standard
-    $(COMMAND_ECHO)$(COPY) script-lb.xml Events.xml Global.xml Test_10er.xml Test_DB.xml \
-        Test_Ext.xml $(MISC)/zip/Basic/Standard/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs
-    $(COMMAND_ECHO)$(COPY) dialog-lc.xml $(MISC)/zip/Dialogs/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs/Standard
-    $(COMMAND_ECHO)$(COPY) dialog-lb.xml OptionsDlg.xml $(MISC)/zip/Dialogs/Standard/
-    $(COMMAND_ECHO)cd $(MISC)/zip && zip -rD $(@:f) .
-
-.INCLUDE: target.mk
diff --git a/smoketest/makefile.mk b/smoketest/makefile.mk
deleted file mode 100755
index 2f474b2..0000000
--- a/smoketest/makefile.mk
+++ /dev/null
@@ -1,49 +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 = smoketestoo_native
-TARGET = smoketest
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-ABORT_ON_ASSERTION = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1TARGET = smoketest
-SHL1OBJS = $(SLO)/smoketest.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(UNOTESTLIB)
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE :     target.mk
diff --git a/smoketest/prj/build.lst b/smoketest/prj/build.lst
index abec637..f45704c 100644
--- a/smoketest/prj/build.lst
+++ b/smoketest/prj/build.lst
@@ -1,4 +1,2 @@
 smt smoketest :: codemaker javaunohelper soltools test unoil NULL
-smt smoketest\com\sun\star\comp\smoketest nmake - all smoketest_com_sun_star_comp_smoketest NULL
-smt smoketest\data nmake - all smoketest_data NULL
-smt smoketest nmake - all smoketest_mk smoketest_com_sun_star_comp_smoketest smoketest_data NULL
+smt smoketest\prj nmake - all smoketest_prj NULL
diff --git a/smoketest/prj/d.lst b/smoketest/prj/d.lst
index 4da25c2..e69de29 100644
--- a/smoketest/prj/d.lst
+++ b/smoketest/prj/d.lst
@@ -1,4 +0,0 @@
-..\losmoketest %_DEST%\bin\losmoketest
-..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
-..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin\TestExtension.oxt
-..\%__SRC%\lib\libsmoketest.* %_DEST%\lib\libsmoketest.*
diff --git a/smoketest/prj/makefile.mk b/smoketest/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/smoketest/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
-- 
1.7.1