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/14 23:51:21 UTC
svn commit: r1409500 - in /incubator/ooo/branches/gbuild/main:
setup_native/prj/ setup_native/source/win32/customactions/quickstarter/
sfx2/ sfx2/inc/pch/ sfx2/prj/ sfx2/source/appl/
Author: arist
Date: Wed Nov 14 22:51:20 2012
New Revision: 1409500
URL: http://svn.apache.org/viewvc?rev=1409500&view=rev
Log:
gnumake4_015_be9aeca025a2.patch
# HG changeset patch
# User mba
# Date 1298658070 -3600
# Node ID be9aeca025a286bcd0920bac1478fdfd8498f476
# Parent e5f7eebdf81648a5d8ba2409c72cb463ff0178f9
CWS gnumake4: remove annoying dependency of sfx2 on setup_native
Modified:
incubator/ooo/branches/gbuild/main/setup_native/prj/build.lst
incubator/ooo/branches/gbuild/main/setup_native/prj/d.lst
incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
incubator/ooo/branches/gbuild/main/sfx2/Package_inc.mk
incubator/ooo/branches/gbuild/main/sfx2/inc/pch/precompiled_sfx2.hxx
incubator/ooo/branches/gbuild/main/sfx2/prj/build.lst
incubator/ooo/branches/gbuild/main/sfx2/source/appl/shutdowniconw32.cxx
Modified: incubator/ooo/branches/gbuild/main/setup_native/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/setup_native/prj/build.lst?rev=1409500&r1=1409499&r2=1409500&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/setup_native/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/setup_native/prj/build.lst Wed Nov 14 22:51:20 2012
@@ -1,4 +1,4 @@
-pk setup_native : L10N:l10n l10ntools soltools sal xml2cmp NULL
+pk setup_native : L10N:l10n l10ntools sfx2 soltools sal xml2cmp NULL
pk setup_native usr1 - all sn_mkout NULL
pk setup_native\scripts\source nmake - u sn_source NULL
pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL
Modified: incubator/ooo/branches/gbuild/main/setup_native/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/setup_native/prj/d.lst?rev=1409500&r1=1409499&r2=1409500&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/setup_native/prj/d.lst (original)
+++ incubator/ooo/branches/gbuild/main/setup_native/prj/d.lst Wed Nov 14 22:51:20 2012
@@ -56,5 +56,3 @@ mkdir: %_DEST%\bin%_EXT%\osolsmf
..\%__SRC%\lib\getuid.so %_DEST%\bin%_EXT%\getuid.so
-..\inc\setup_native\qswin32.h %_DEST%\inc%_EXT%\setup_native\qswin32.h
-
Modified: incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx?rev=1409500&r1=1409499&r2=1409500&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx (original)
+++ incubator/ooo/branches/gbuild/main/setup_native/source/win32/customactions/quickstarter/shutdown_quickstart.cxx Wed Nov 14 22:51:20 2012
@@ -22,7 +22,7 @@
#include "quickstarter.hxx"
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
static BOOL CALLBACK EnumWindowsProc( HWND hWnd, LPARAM lParam )
{
Modified: incubator/ooo/branches/gbuild/main/sfx2/Package_inc.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/Package_inc.mk?rev=1409500&r1=1409499&r2=1409500&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/Package_inc.mk (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/Package_inc.mk Wed Nov 14 22:51:20 2012
@@ -131,3 +131,4 @@ $(eval $(call gb_Package_add_file,sfx2_i
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx))
+$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/qswin32.h,sfx2/qswin32.h))
Modified: incubator/ooo/branches/gbuild/main/sfx2/inc/pch/precompiled_sfx2.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/inc/pch/precompiled_sfx2.hxx?rev=1409500&r1=1409499&r2=1409500&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/inc/pch/precompiled_sfx2.hxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/inc/pch/precompiled_sfx2.hxx Wed Nov 14 22:51:20 2012
@@ -476,7 +476,6 @@
#include "rtl/ustring.hxx"
#include "sal/config.h"
#include "sal/types.h"
-#include "setup_native/qswin32.h"
#include "sot/clsids.hxx"
#include "sot/exchange.hxx"
#include "sot/factory.hxx"
Modified: incubator/ooo/branches/gbuild/main/sfx2/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/prj/build.lst?rev=1409500&r1=1409499&r2=1409500&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/prj/build.lst (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/prj/build.lst Wed Nov 14 22:51:20 2012
@@ -1,3 +1,3 @@
-sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell setup_native sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
+sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell sax LIBXML2:libxml2 LIBXSLT:libxslt NULL
sf sfx2\prj nmake - all sf_prj NULL
Modified: incubator/ooo/branches/gbuild/main/sfx2/source/appl/shutdowniconw32.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/sfx2/source/appl/shutdowniconw32.cxx?rev=1409500&r1=1409499&r2=1409500&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/sfx2/source/appl/shutdowniconw32.cxx (original)
+++ incubator/ooo/branches/gbuild/main/sfx2/source/appl/shutdowniconw32.cxx Wed Nov 14 22:51:20 2012
@@ -49,7 +49,7 @@
#include <stdio.h>
#include <io.h>
#include <osl/thread.h>
-#include <setup_native/qswin32.h>
+#include <sfx2/qswin32.h>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/uno/Reference.h>