gbuild'ize smoketest(oo_native) and merge them

Add smoketest to tail_build and make it a subsequentcheck target.

4 files changed, 0 insertions, 130 deletions

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 83c370e11a18..000000000000
--- 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 636fda90bfcb..000000000000
--- 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 88e5370ef7d3..000000000000
--- 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 fcedabf96b4b..0e730444291c 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>