incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1305304 - in /incubator/ooo/trunk/main: extensions/prj/ extensions/source/nsplugin/ extensions/source/plugin/ np_sdk/ postprocess/packcomponents/ postprocess/rebase/ scp2/source/ooo/ toolkit/src2xml/
Date Mon, 26 Mar 2012 10:51:42 GMT
Author: alg
Date: Mon Mar 26 10:51:41 2012
New Revision: 1305304

URL: http://svn.apache.org/viewvc?rev=1305304&view=rev
Log:
#119098# Removed np_sdk and related stuff due to conflict with it's triple license, was not
in active use. Test builded all three main platforms and checked, works well

Removed:
    incubator/ooo/trunk/main/extensions/source/nsplugin/
    incubator/ooo/trunk/main/extensions/source/plugin/
    incubator/ooo/trunk/main/np_sdk/
Modified:
    incubator/ooo/trunk/main/extensions/prj/build.lst
    incubator/ooo/trunk/main/extensions/prj/d.lst
    incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
    incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
    incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
    incubator/ooo/trunk/main/toolkit/src2xml/include.lst

Modified: incubator/ooo/trunk/main/extensions/prj/build.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extensions/prj/build.lst?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extensions/prj/build.lst (original)
+++ incubator/ooo/trunk/main/extensions/prj/build.lst Mon Mar 26 10:51:41 2012
@@ -1,20 +1,12 @@
-ex  extensions :  officecfg  L10N:l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc
ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
+ex  extensions :  officecfg  L10N:l10n rdbmaker svx SANE:sane TWAIN:twain offuh stoc ZLIB:zlib
CURL:curl LIBXSLT:libxslt NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
 ex  extensions\inc\ucbhelper                    get     -   all ex_incucbh ex_inc NULL
-ex  extensions\source\plugin\workben            get     -   all ex_plwkb ex_inc NULL
-ex  extensions\source\plugin\inc\plugin\win     get     -   all ex_piwi ex_inc NULL
-ex  extensions\source\plugin\inc\plugin\unx     get     -   all ex_piux ex_inc NULL
 ex  extensions\source\activex\msidl             nmake   -   w   ex_axmsidl ex_inc NULL
 ex  extensions\source\activex\main              nmake   -   w   ex_axmain ex_axmsidl.w ex_inc
NULL
 ex  extensions\source\ole                       nmake   -   w   ex_ole ex_xmlextr ex_inc
NULL
 ex  extensions\source\resource                  nmake   -   all ex_resrc ex_inc NULL
-ex  extensions\source\plugin\aqua               nmake   -   u   ex_plaqua ex_plbase NULL
-ex  extensions\source\plugin\base               nmake   -   all ex_plbase ex_inc NULL
-ex  extensions\source\plugin\win                nmake   -   w   ex_plwin ex_plbase ex_inc
NULL
-ex  extensions\source\plugin\unx                nmake   -   u   ex_plunx ex_inc NULL
-ex  extensions\source\plugin\util               nmake   -   all ex_plutil ex_plbase ex_plunx.u
ex_plwin.w ex_plaqua.u ex_inc NULL
 ex  extensions\source\macosx\spotlight          nmake   -   u   ex_mxspotlight NULL
 ex  extensions\source\scanner                   nmake   -   all ex_scan ex_resrc ex_inc NULL
 ex  extensions\source\bibliography              nmake   -   all ex_bib ex_inc NULL
@@ -27,12 +19,10 @@ ex  extensions\source\oooimprovecore    
 ex  extensions\source\oooimprovement            nmake   -   all ex_oooimprovement ex_inc
NULL
 ex  extensions\source\preload                   nmake   -   all ex_preload  ex_inc NULL
 ex  extensions\source\config\ldap               nmake   -   all ex_ldap ex_inc NULL
-ex	extensions\source\nsplugin\source			nmake	-	u	ex_nsplugin ex_inc NULL
-ex	extensions\source\nsplugin\source			nmake	-	w	ex_nsplugin ex_inc NULL
 ex  extensions\source\update\feed               nmake   -   all ex_updchkfeed ex_inc NULL
 ex  extensions\source\update\check              nmake   -   all ex_updchk ex_inc NULL
 ex  extensions\source\update\ui                 nmake   -   all ex_updchkui ex_inc NULL
-ex  extensions\util                             nmake   -   all ex_util ex_preload ex_abpilot
ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
+ex  extensions\util                             nmake   -   all ex_util ex_preload ex_abpilot
ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_oooimprovecore NULL
 
 # Fails at the moment
 # ex  extensions\qa\complex\extensions            nmake   -   all ex_complex ex_util NULL

Modified: incubator/ooo/trunk/main/extensions/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extensions/prj/d.lst?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extensions/prj/d.lst (original)
+++ incubator/ooo/trunk/main/extensions/prj/d.lst Mon Mar 26 10:51:41 2012
@@ -48,7 +48,6 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool\
 ..\%__SRC%\misc\oooimprovecore.component %_DEST%\xml%_EXT%\oooimprovecore.component
 ..\%__SRC%\misc\oooimprovement.component %_DEST%\xml%_EXT%\oooimprovement.component
 ..\%__SRC%\misc\pcr.component %_DEST%\xml%_EXT%\pcr.component
-..\%__SRC%\misc\pl.component %_DEST%\xml%_EXT%\pl.component
 ..\%__SRC%\misc\preload.component %_DEST%\xml%_EXT%\preload.component
 ..\%__SRC%\misc\res.component %_DEST%\xml%_EXT%\res.component
 ..\%__SRC%\misc\scn.component %_DEST%\xml%_EXT%\scn.component

Modified: incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ incubator/ooo/trunk/main/postprocess/packcomponents/makefile.mk Mon Mar 26 10:51:41 2012
@@ -290,8 +290,7 @@ my_components += ldapbe2
 my_components += \
     xmlsecurity \
     xsec_fw \
-    xsec_xmlsec \
-    pl
+    xsec_xmlsec
 .END
 
 .IF "$(OS)" == "MACOSX"

Modified: incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt (original)
+++ incubator/ooo/trunk/main/postprocess/rebase/coffbase.txt Mon Mar 26 10:51:41 2012
@@ -181,7 +181,6 @@ mozabdrvmi.dll   0x00000000597d0000 0x00
 msci_uno.dll     0x0000000061860000 0x00010000
 mysql2.dll       0x0000000061820000 0x00030000
 namingservice.uno.dll 0x0000000061800000 0x00010000
-npsoplugin.dll   0x00000000617e0000 0x00010000
 npsoplugin_so.dll 0x00000000617c0000 0x00010000
 nullcanvas.uno.dll 0x0000000061770000 0x00040000
 odbc2.dll        0x0000000061750000 0x00010000
@@ -339,7 +338,6 @@ xsec_xmlsec.dll  0x000000005b250000 0x00
 xsltdlgmi.dll    0x000000005b200000 0x00040000
 xsltfiltermi.dll 0x000000005b1e0000 0x00010000
 xstor.dll        0x000000005b190000 0x00040000
-npsoplugin.dll   0x000000005b0b0000 0x00010000
 migrationoo2.uno.dll 0x000000005b080000 0x00020000
 inprocserv.dll   0x000000005b060000 0x00010000
 lngmi.dll        0x000000005af50000 0x00100000

Modified: incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/common_brand.scp Mon Mar 26 10:51:41 2012
@@ -486,15 +486,6 @@ File gid_Brand_File_Bin_Libxml2
 End
 #endif
 
-#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
-File gid_Brand_File_Lib_Npsoplugin
-    BIN_FILE_BODY;
-    Name = SPECIAL_NAME(npsoplugin);
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-End
-#endif
-
 File gid_Brand_File_Bmp_IntroAbout
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon Mar 26 10:51:41 2012
@@ -1139,10 +1139,6 @@ STD_LIB_FILE(gid_File_Lib_DeploymentMisc
 STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
 #endif
 
-#ifndef WITHOUT_MOZILLA
-STD_LIB_FILE( gid_File_Lib_Pl , pl)
-#endif
-
 #ifdef OS2
 STD_LIB_FILE( gid_File_Lib_Preload, preloadg)
 #else

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_ooo.scp Mon Mar 26 10:51:41 2012
@@ -115,33 +115,6 @@ End
 
 #endif
 
-#ifndef WITHOUT_MOZILLA
-
-#if !defined(UNX) || defined(ENABLE_GTK)
-File gid_File_Exe_Nsplugin
-        BIN_FILE_BODY;
-        Styles          = (PACKED);
-        Dir             = gid_Dir_Program;
- #ifdef UNX
-        Name            = "nsplugin";
- #else
-    Name = "nsplugin.exe";
-  #endif
-End
-#endif
-#endif
-
-#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
-
-File gid_File_Bin_Pluginapp
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "pluginapp.bin";
-    Styles = (PACKED);
-End
-
-#endif
-
 #ifdef UNX
 
 File gid_File_Bin_Open_Url

Modified: incubator/ooo/trunk/main/toolkit/src2xml/include.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/src2xml/include.lst?rev=1305304&r1=1305303&r2=1305304&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/src2xml/include.lst (original)
+++ incubator/ooo/trunk/main/toolkit/src2xml/include.lst Mon Mar 26 10:51:41 2012
@@ -215,7 +215,6 @@
 ../../libwps/unxlngi6.pro/inc
 ../../lingucomponent/inc
 ../../lingucomponent/unxlngi6.pro/inc
-../../np_sdk/unxlngi6.pro/inc
 ../../offapi/unxlngi6.pro/inc
 ../../xmlsecurity/inc
 ../../xmlsecurity/unxlngi6.pro/inc



Mime
View raw message