You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:55:52 UTC
svn commit: r1409577 - in /incubator/ooo/branches/gbuild/main: dbaccess/
reportdesign/
Author: arist
Date: Wed Nov 14 23:55:50 2012
New Revision: 1409577
URL: http://svn.apache.org/viewvc?rev=1409577&view=rev
Log:
gnumake4_128_ba7a15028880.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1302888426 0
# Node ID ba7a15028880195063995029f0327250e8f66601
# Parent a50be766f278750e696c0b830a3e1ba01cfd4376
gnumake4: reportdesign, dbaccess: remove DOS lineendings
Modified:
incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk
incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk
incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk
incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk
incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk
incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk
incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk
incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk
incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk
incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk
incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk
incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk
incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk
incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk
incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk
incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk
incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk
Modified: incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_adabasui.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dba.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platdbam office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbmm.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_dbui.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -108,13 +108,13 @@ $(WORKDIR)/inc/dbaccess/AutoControls.hrc
echo copying $@
-mkdir -p $(WORKDIR)/inc/dbaccess
cp $(SRCDIR)/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc $(WORKDIR)/inc/dbaccess/AutoControls.hrc
- rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
+ rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
$(WORKDIR)/inc/dbaccess/toolbox.hrc : $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc
echo copying $@
-mkdir -p $(WORKDIR)/inc/dbaccess
cp $(SRCDIR)/dbaccess/source/ui/inc/toolbox_tmpl.hrc $(WORKDIR)/inc/dbaccess/toolbox.hrc
- rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
+ rm -f $(WORKDIR)/inc/dbaccess/lastrun.mk
else
-include $(WORKDIR)/inc/dbaccess/lastrun.mk
ifneq ($(gb_lastrun_globlmn),MERGED)
Modified: incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_complex.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -78,4 +78,4 @@ $(eval $(call gb_JunitTest_add_classes,d
complex.dbaccess.TestCase \
))
-# vim: set noet dbaccess=4 ts=4:
+# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/JunitTest_dbaccess_unoapi.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -50,4 +50,4 @@ $(eval $(call gb_JunitTest_add_classes,d
org.openoffice.dbaccess.qa.unoapi.Test \
))
-# vim: set noet dbaccess=4 ts=4:
+# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_adabasui.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dba.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dbaxml.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dbmm.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_dbui.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Library_sdbt.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Package_inc.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/AllLangResTarget_rpt.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platdbam office productivity suite
Modified: incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/JunitTest_reportdesign_complex.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -45,4 +45,4 @@ $(eval $(call gb_JunitTest_add_classes,r
complex.reportdesign.ReportDesignerTest \
))
-# vim: set noet reportdesign=4 ts=4:
+# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Library_rpt.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Library_rptui.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Library_rptxml.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Module_reportdesign.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Package_uiconfig.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
Modified: incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk?rev=1409577&r1=1409576&r2=1409577&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk (original)
+++ incubator/ooo/branches/gbuild/main/reportdesign/Package_xml.mk Wed Nov 14 23:55:50 2012
@@ -1,7 +1,7 @@
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite