re-base on ALv2 code. Includes:

118568: switch to using ucpp
Patch contributed by Juergen Schmidt
http://svn.apache.org/viewvc?view=revision&revision=1209396

5 files changed, 113 insertions, 0 deletions

diff --git a/ucpp/makefile.mk b/ucpp/makefile.mk
new file mode 100644
index 000000000000..9de72632bd64
--- /dev/null
+++ b/ucpp/makefile.mk
@@ -0,0 +1,44 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements. See the NOTICE file distributed
+#   with this work for additional information regarding copyright
+#   ownership. The ASF licenses this file to you under the Apache
+#   License, Version 2.0 (the "License"); you may not use this file
+#   except in compliance with the License. You may obtain a copy of
+#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+PRJ=.
+
+PRJNAME=ucpp
+TARGET=ucpp
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=ucpp-1.3.2
+TARFILE_ROOTDIR=ucpp
+TARFILE_MD5=0168229624cfac409e766913506961a8
+PATCH_FILES=ucpp.patch
+
+ADDITIONAL_FILES=makefile.mk
+
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/ucpp/prj/build.lst b/ucpp/prj/build.lst
new file mode 100644
index 000000000000..4eb6c24addf6
--- /dev/null
+++ b/ucpp/prj/build.lst
@@ -0,0 +1,3 @@
+ucpp      ucpp  :  soltools NULL
+ucpp      ucpp     usr1           -       all     ucpp_mkout NULL
+ucpp      ucpp     nmake          -       all     ucpp_ucpp NULL
diff --git a/ucpp/prj/d.lst b/ucpp/prj/d.lst
new file mode 100644
index 000000000000..6b3d28056ab3
--- /dev/null
+++ b/ucpp/prj/d.lst
@@ -0,0 +1,4 @@
+..\%__SRC%\bin\ucpp.exe %_DEST%\bin\ucpp.exe
+..\%__SRC%\bin\ucpp.pdb %_DEST%\bin\ucpp.pdb
+
+..\%__SRC%\bin\ucpp %_DEST%\bin\ucpp
diff --git a/ucpp/prj/dmake b/ucpp/prj/dmake
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/ucpp/prj/dmake
diff --git a/ucpp/ucpp.patch b/ucpp/ucpp.patch
new file mode 100644
index 000000000000..169a7e6c4adc
--- /dev/null
+++ b/ucpp/ucpp.patch
@@ -0,0 +1,62 @@
+--- misc/ucpp/makefile.mk
++++ misc/build/ucpp/makefile.mk
+@@ -1 +1,47 @@
+-dummy
++#
++# This file is part of the LibreOffice project.
++#
++# This Source Code Form is subject to the terms of the Mozilla Public
++# License, v. 2.0. If a copy of the MPL was not distributed with this
++# file, You can obtain one at http://mozilla.org/MPL/2.0/.
++#
++# This file incorporates work covered by the following license notice:
++#
++#   Licensed to the Apache Software Foundation (ASF) under one or more
++#   contributor license agreements. See the NOTICE file distributed
++#   with this work for additional information regarding copyright
++#   ownership. The ASF licenses this file to you under the Apache
++#   License, Version 2.0 (the "License"); you may not use this file
++#   except in compliance with the License. You may obtain a copy of
++#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
++#
++PRJ=..$/..$/..$/..
++
++PRJNAME=ucpp
++TARGET=ucpp
++TARGETTYPE=CUI
++LIBTARGET=NO
++NO_DEFAULT_STL=TRUE
++
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++
++# --- Settings -----------------------------------------------------
++.INCLUDE :  settings.mk
++
++UWINAPILIB=
++LIBSALCPPRT=
++
++# --- Files --------------------------------------------------------
++
++CFLAGS+= -DNO_UCPP_BUF -DUCPP_CONFIG -DSTAND_ALONE
++
++APP1TARGET= $(TARGET)
++APP1OBJS=   $(OBJ)$/assert.obj $(OBJ)$/cpp.obj $(OBJ)$/eval.obj $(OBJ)$/hash.obj $(OBJ)$/lexer.obj $(OBJ)$/macro.obj $(OBJ)$/mem.obj $(OBJ)$/nhash.obj
++
++APP1STDLIBS=
++
++
++OBJFILES = $(APP1OBJS)
++
++.INCLUDE :  target.mk
++
+--- misc/ucpp/cpp.c
++++ misc/build/ucpp/cpp.c
+@@ -2464,7 +2464,7 @@
+ 			warning(-1, "unknown option '%s'", argv[i]);
+ 	} else {
+ 		if (filename != 0) {
+-			error(-1, "spurious filename '%s'", argv[i]);
++			error(-1, "spurious duplicate filename '%s' - vs. '%s' ", argv[i], filename);
+ 			return 2;
+ 		}
+ 		filename = argv[i];