From 54c62022ca217142361d003e1f5d7387a21edab0 Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 12 Jan 2010 18:49:59 +0100 Subject: [PATCH 1/5] sb118: #i108269# first step of removing tcsh support --- odk/util/makefile.mk | 2 -- odk/util/makefile.pmk | 12 +----------- odk/util/odk_rules.pmk | 28 ---------------------------- 3 files changed, 1 insertion(+), 41 deletions(-) diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk index ed836730a165..7f6517ed42a8 100644 --- a/odk/util/makefile.mk +++ b/odk/util/makefile.mk @@ -24,9 +24,7 @@ ALLTAR:\ $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS) cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . $(CHECKZIPRESULT) -.IF "$(USE_SHELL)"!="4nt" $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@ -.ENDIF # "$(USE_SHELL)"!="4nt" # cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/$(PRODUCTZIPFILE) . -x "idl/*" $(CHECKZIPRESULT) # cd $(BIN)$/$(PRODUCT_NAME) && zip -urq ..$/odkidl.zip idl/* $(CHECKZIPRESULT) diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 33ff68c90ab1..b1c690e9bb74 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -211,18 +211,8 @@ INCLUDEFILELIST=\ $(INCOUT)$/com$/sun$/star$/uno$/Type.h \ $(INCOUT)$/com$/sun$/star$/uno$/Type.hxx -.IF "$(USE_SHELL)"=="4nt" -# Quoted Open Bracket -QOB -# Quoted Close Bracket -QCB -QOB=( -QCB=) -.ELSE -QOB=\( -QCB=\) -.ENDIF - INCLUDELIST:=\ - {$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \ + {$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! \( -name "*~" -o -name "*build.lst" -o -name "*deliver.log" \) -print))} \ $(INCLUDEFILELIST) SDK_CONTENT_CHECK_FILES= \ diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index 9f987e7ae448..63d881c3bd1f 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -53,58 +53,36 @@ $(DESTDIRDOCUIMAGES)$/% : $(PRJ)$/docs$/images$/% $(DESTDIR)$/configure : $(PRJ)$/configure @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ -.ENDIF $(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ -.ENDIF $(DESTDIR)$/config.guess : $(SRC_ROOT)$/config.guess @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ -.ENDIF $(DESTDIR)$/config.sub : $(SRC_ROOT)$/config.sub @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ -.ENDIF $(DESTDIR)$/setsdkenv_unix : $(PRJ)$/setsdkenv_unix @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ -.ENDIF - -#.IF "$(USE_SHELL)"=="4nt" -# $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ -#.ELSE -# $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ -#.ENDIF $(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 644 $@ -.ENDIF $(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat @@-rm -f $@ -.IF "$(USE_SHELL)"=="4nt" - $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ -.ELSE $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ -.ENDIF $(DESTDIR)$/%.bat : $(PRJ)$/%.bat @@-rm -f $@ @@ -144,9 +122,7 @@ $(DESTDIRBIN)$/%.bin : $(BINOUT)$/%.bin $(DESTDIRBIN)$/regcomp : $(BINOUT)$/regcomp @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" -chmod 755 $@ -.ENDIF $(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) : $(BIN)$/unoapploader$(EXEPOSTFIX) @@-rm -f $@ @@ -200,11 +176,7 @@ $(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a $(GNUCOPY) $(LIBOUT)$/$(@:f) $@ $(DIR_CREATE_FLAG) : -.IF "$(USE_SHELL)" != "4nt" $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@ -.ELSE - $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s#\#/#)) | $(XARGS) mkdir.exe -p && echo "dirs created" > $@ && touch $@ -.ENDIF $(DELAY) 2 $(DESTDIRSETTINGS)$/component.uno.def : $(PRJ)$/settings$/component.uno.def From a6c104b7976679420c0e50faa8586f402365ac38 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 23 Mar 2010 15:47:53 +0100 Subject: [PATCH 2/5] ause117: #i110336# cleanup --- odk/pack/copying/makefile.mk | 194 +++++++++++++++++------------------ odk/util/makefile.pmk | 140 ++++++++++++------------- odk/util/odk_rules.pmk | 163 ++++++++++++----------------- 3 files changed, 229 insertions(+), 268 deletions(-) diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index 5396496e1a3a..3d73d4d1b63f 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -25,149 +25,149 @@ # #************************************************************************* -PRJ=..$/.. +PRJ=../.. PRJNAME=odk TARGET=copying #---------------------------------------------------------------- .INCLUDE: settings.mk -.INCLUDE: $(PRJ)$/util$/makefile.pmk +.INCLUDE: $(PRJ)/util/makefile.pmk #---------------------------------------------------------------- -IDLLIST:={$(subst,/,$/ $(shell @$(FIND) $(IDLOUT) -type f | sed -e '/star.portal/d' -e'/star.webservices/d'))} +IDLLIST:={$(subst,/,/ $(shell @$(FIND) $(IDLOUT) -type f | sed -e '/star.portal/d' -e'/star.webservices/d'))} DESTIDLLIST={$(subst,$(IDLOUT),$(DESTDIRIDL) $(IDLLIST))} DESTINCLUDELIST={$(subst,$(SOLARINCDIR),$(DESTDIRINC) $(INCLUDELIST))} -DESTINCLUDELIST+=$(DESTDIRINC)$/udkversion.mk +DESTINCLUDELIST+=$(DESTDIRINC)/udkversion.mk DESTINCDIRLIST={$(subst,$(INCOUT),$(DESTDIRINC) $(INCLUDEDIRLIST))} -IDL_DOCU_INDEX_FILE = $(DESTDIRGENIDLREF)$/module-ix.html -IDL_DOCU_CLEANUP_FLAG = $(MISC)$/idl_docu_cleanup.flag +IDL_DOCU_INDEX_FILE = $(DESTDIRGENIDLREF)/module-ix.html +IDL_DOCU_CLEANUP_FLAG = $(MISC)/idl_docu_cleanup.flag IDL_CHAPTER_REFS=idl_chapter_refs.txt EXELIST = \ - $(DESTDIRBIN)$/cppumaker$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/regcompare$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/idlcpp$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/idlc$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/javamaker$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/autodoc$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) \ - $(DESTDIRBIN)$/uno-skeletonmaker$(EXEPOSTFIX) + $(DESTDIRBIN)/cppumaker$(EXEPOSTFIX) \ + $(DESTDIRBIN)/regcompare$(EXEPOSTFIX) \ + $(DESTDIRBIN)/idlcpp$(EXEPOSTFIX) \ + $(DESTDIRBIN)/idlc$(EXEPOSTFIX) \ + $(DESTDIRBIN)/javamaker$(EXEPOSTFIX) \ + $(DESTDIRBIN)/autodoc$(EXEPOSTFIX) \ + $(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) \ + $(DESTDIRBIN)/uno-skeletonmaker$(EXEPOSTFIX) .IF "$(GUI)"=="WNT" EXELIST += \ - $(DESTDIRBIN)$/climaker$(EXEPOSTFIX) + $(DESTDIRBIN)/climaker$(EXEPOSTFIX) .ENDIF .IF "$(GUI)"=="WNT" CLILIST = \ - $(DESTDIRCLI)$/cli_basetypes.dll \ - $(DESTDIRCLI)$/cli_uretypes.dll \ - $(DESTDIRCLI)$/cli_oootypes.dll \ - $(DESTDIRCLI)$/cli_ure.dll \ - $(DESTDIRCLI)$/cli_cppuhelper.dll + $(DESTDIRCLI)/cli_basetypes.dll \ + $(DESTDIRCLI)/cli_uretypes.dll \ + $(DESTDIRCLI)/cli_oootypes.dll \ + $(DESTDIRCLI)/cli_ure.dll \ + $(DESTDIRCLI)/cli_cppuhelper.dll .ENDIF .IF "$(GUI)"=="WNT" LIBLIST = \ - $(DESTDIRLIB)$/istore.lib \ - $(DESTDIRLIB)$/ireg.lib \ - $(DESTDIRLIB)$/isal.lib \ - $(DESTDIRLIB)$/isalhelper.lib \ - $(DESTDIRLIB)$/icppu.lib \ - $(DESTDIRLIB)$/icppuhelper.lib \ - $(DESTDIRLIB)$/irmcxt.lib \ - $(DESTDIRLIB)$/ipurpenvhelper3MSC.lib + $(DESTDIRLIB)/istore.lib \ + $(DESTDIRLIB)/ireg.lib \ + $(DESTDIRLIB)/isal.lib \ + $(DESTDIRLIB)/isalhelper.lib \ + $(DESTDIRLIB)/icppu.lib \ + $(DESTDIRLIB)/icppuhelper.lib \ + $(DESTDIRLIB)/irmcxt.lib \ + $(DESTDIRLIB)/ipurpenvhelper3MSC.lib .IF "$(COMEX)"=="8" - LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib + LIBLIST += $(DESTDIRLIB)/stlport_vc7.lib .ELIF "$(COMEX)"=="10" || "$(COMEX)"=="11" || "$(COMEX)"=="12" - LIBLIST += $(DESTDIRLIB)$/stlport_vc71.lib + LIBLIST += $(DESTDIRLIB)/stlport_vc71.lib .ELSE - LIBLIST += $(DESTDIRLIB)$/stlport_vc6.lib + LIBLIST += $(DESTDIRLIB)/stlport_vc6.lib .ENDIF .ENDIF .IF "$(OS)"=="LINUX" - LIBLIST = $(DESTDIRLIB)$/libsalcpprt.a + LIBLIST = $(DESTDIRLIB)/libsalcpprt.a .ENDIF # note, that inner class files are copied implicitly DESTCLASSESLIST= \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/Loader.class \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/InstallationFinder.class \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/WinRegKey.class \ - $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/WinRegKeyException.class -# $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/Loader$$CustomURLClassLoader.class \ -# $(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/InstallationFinder$$StreamGobbler.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/Loader.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/InstallationFinder.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/WinRegKey.class \ + $(DESTDIRJAR)/com/sun/star/lib/loader/WinRegKeyException.class +# $(DESTDIRJAR)/com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \ +# $(DESTDIRJAR)/com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \ SETTINGSLIST= \ - $(DESTDIRSETTINGS)$/settings.mk \ - $(DESTDIRSETTINGS)$/std.mk \ - $(DESTDIRSETTINGS)$/stdtarget.mk \ - $(DESTDIRSETTINGS)$/dk.mk + $(DESTDIRSETTINGS)/settings.mk \ + $(DESTDIRSETTINGS)/std.mk \ + $(DESTDIRSETTINGS)/stdtarget.mk \ + $(DESTDIRSETTINGS)/dk.mk .IF "$(GUI)"=="WNT" -SETTINGSLIST+=$(DESTDIRSETTINGS)$/component.uno.def +SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.def .ENDIF .IF "$(GUI)"=="UNX" -SETTINGSLIST+=$(DESTDIRSETTINGS)$/component.uno.map +SETTINGSLIST+=$(DESTDIRSETTINGS)/component.uno.map .ENDIF DOCUHTMLFILES+= \ - $(DESTDIR)$/index.html \ - $(DESTDIRDOCU)$/tools.html \ - $(DESTDIRDOCU)$/notsupported.html \ - $(DESTDIRDOCU)$/install.html \ - $(DESTDIREXAMPLES)$/examples.html \ - $(DESTDIREXAMPLES)$/DevelopersGuide$/examples.html + $(DESTDIR)/index.html \ + $(DESTDIRDOCU)/tools.html \ + $(DESTDIRDOCU)/notsupported.html \ + $(DESTDIRDOCU)/install.html \ + $(DESTDIREXAMPLES)/examples.html \ + $(DESTDIREXAMPLES)/DevelopersGuide/examples.html DOCUFILES= \ $(DOCUHTMLFILES) \ - $(DESTDIRDOCU)$/sdk_styles.css \ - $(DESTDIRGENIDLREF)$/idl.css \ - $(DESTDIRDOCUIMAGES)$/nada.gif \ - $(DESTDIRDOCUIMAGES)$/arrow-2.gif \ - $(DESTDIRDOCUIMAGES)$/bluball.gif \ - $(DESTDIRDOCUIMAGES)$/so-main-app_32.png \ - $(DESTDIRDOCUIMAGES)$/ooo-main-app_32.png \ - $(DESTDIRDOCUIMAGES)$/arrow-1.gif \ - $(DESTDIRDOCUIMAGES)$/arrow-3.gif \ - $(DESTDIRDOCUIMAGES)$/bg_table.gif \ - $(DESTDIRDOCUIMAGES)$/bg_table2.gif \ - $(DESTDIRDOCUIMAGES)$/bg_table3.gif \ - $(DESTDIRDOCUIMAGES)$/nav_down.png \ - $(DESTDIRDOCUIMAGES)$/nav_home.png \ - $(DESTDIRDOCUIMAGES)$/nav_left.png \ - $(DESTDIRDOCUIMAGES)$/nav_right.png \ - $(DESTDIRDOCUIMAGES)$/nav_up.png \ - $(DESTDIRDOCUIMAGES)$/sdk_head-1.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_head-2.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_head-3.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_line-1.gif \ - $(DESTDIRDOCUIMAGES)$/sdk_line-2.gif + $(DESTDIRDOCU)/sdk_styles.css \ + $(DESTDIRGENIDLREF)/idl.css \ + $(DESTDIRDOCUIMAGES)/nada.gif \ + $(DESTDIRDOCUIMAGES)/arrow-2.gif \ + $(DESTDIRDOCUIMAGES)/bluball.gif \ + $(DESTDIRDOCUIMAGES)/so-main-app_32.png \ + $(DESTDIRDOCUIMAGES)/ooo-main-app_32.png \ + $(DESTDIRDOCUIMAGES)/arrow-1.gif \ + $(DESTDIRDOCUIMAGES)/arrow-3.gif \ + $(DESTDIRDOCUIMAGES)/bg_table.gif \ + $(DESTDIRDOCUIMAGES)/bg_table2.gif \ + $(DESTDIRDOCUIMAGES)/bg_table3.gif \ + $(DESTDIRDOCUIMAGES)/nav_down.png \ + $(DESTDIRDOCUIMAGES)/nav_home.png \ + $(DESTDIRDOCUIMAGES)/nav_left.png \ + $(DESTDIRDOCUIMAGES)/nav_right.png \ + $(DESTDIRDOCUIMAGES)/nav_up.png \ + $(DESTDIRDOCUIMAGES)/sdk_head-1.gif \ + $(DESTDIRDOCUIMAGES)/sdk_head-2.gif \ + $(DESTDIRDOCUIMAGES)/sdk_head-3.gif \ + $(DESTDIRDOCUIMAGES)/sdk_line-1.gif \ + $(DESTDIRDOCUIMAGES)/sdk_line-2.gif .IF "$(GUI)"=="UNX" INSTALLSCRIPT= \ - $(DESTDIR)$/config.guess \ - $(DESTDIR)$/config.sub \ - $(DESTDIR)$/configure.pl \ - $(DESTDIR)$/setsdkenv_unix \ - $(DESTDIR)$/setsdkenv_unix.sh.in \ - $(DESTDIR)$/setsdkenv_unix.csh.in + $(DESTDIR)/config.guess \ + $(DESTDIR)/config.sub \ + $(DESTDIR)/configure.pl \ + $(DESTDIR)/setsdkenv_unix \ + $(DESTDIR)/setsdkenv_unix.sh.in \ + $(DESTDIR)/setsdkenv_unix.csh.in .ELSE INSTALLSCRIPT= \ - $(DESTDIR)$/setsdkenv_windows.bat \ - $(DESTDIR)$/setsdkenv_windows.template \ - $(DESTDIR)$/setsdkname.bat \ - $(DESTDIR)$/cfgWin.js + $(DESTDIR)/setsdkenv_windows.bat \ + $(DESTDIR)/setsdkenv_windows.template \ + $(DESTDIR)/setsdkname.bat \ + $(DESTDIR)/cfgWin.js .ENDIF DIR_FILE_LIST=\ @@ -184,25 +184,25 @@ DIR_FILE_LIST=\ $(CONVERTTAGFLAG) .IF "$(OS)"=="MACOSX" -DIR_FILE_LIST += $(DESTDIRBIN)$/addsym-macosx.sh +DIR_FILE_LIST += $(DESTDIRBIN)/addsym-macosx.sh .ENDIF .IF "$(SOLAR_JAVA)" != "" -DIR_FILE_LIST += $(DESTDIRJAR)$/win$/unowinreg.dll +DIR_FILE_LIST += $(DESTDIRJAR)/win/unowinreg.dll .ENDIF DIR_DIRECTORY_LIST:=$(uniq $(DIR_FILE_LIST:d)) -DIR_CREATE_FLAG:=$(MISC)$/copying_dirs_created.txt -DIR_FILE_FLAG:=$(MISC)$/copying_files.txt +DIR_CREATE_FLAG:=$(MISC)/copying_dirs_created.txt +DIR_FILE_FLAG:=$(MISC)/copying_files.txt .IF "$(SOLAR_JAVA)" != "" # Special work for simple uno bootstrap mechanism # zip uno loader class files and winreg helper library for later # use in the build process (e.g. helper tools) -MYZIPTARGET=$(BIN)$/uno_loader_classes.zip +MYZIPTARGET=$(BIN)/uno_loader_classes.zip MYZIPFLAGS=-u -r MYZIPDIR=$(DESTDIRJAR) -MYZIPLIST=com$/* win$/* +MYZIPLIST=com/* win/* .ENDIF @@ -221,21 +221,21 @@ all : CLEAN_DKVERSION_CHECK \ #-------------------------------------------------- # use global rules #-------------------------------------------------- -.INCLUDE: $(PRJ)$/util$/odk_rules.pmk +.INCLUDE: $(PRJ)/util/odk_rules.pmk -CLEANUP_DKVERSION_FILE=$(DESTDIRSETTINGS)$/dk.mk +CLEANUP_DKVERSION_FILE=$(DESTDIRSETTINGS)/dk.mk CLEAN_DKVERSION_CHECK: @@-rm -f $(CLEANUP_DKVERSION_FILE) -$(DESTDIRBIN)$/addsym-macosx.sh : addsym-macosx.sh +$(DESTDIRBIN)/addsym-macosx.sh : addsym-macosx.sh @@-rm -f $@ $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -chmod 755 $@ -$(DESTDIRSETTINGS)$/dk.mk : dk.mk +$(DESTDIRSETTINGS)/dk.mk : dk.mk @@-rm -f $@ -$(MKDIRHIER) $(@:d) tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@ @@ -244,7 +244,7 @@ $(CONVERTTAGFLAG) : $(DOCUHTMLFILES) $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES) @echo "tags converted" > $@ -$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)$/docs$/common$/ref$/idl.css +$(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST) @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENIDLREF) $(TOUCH) $@ @@ -252,11 +252,11 @@ $(IDL_DOCU_INDEX_FILE) : $(IDL_DOCU_CLEANUP_FLAG) -$(MKDIRHIER) $(@:d) $(MY_AUTODOC) -html $(DESTDIRGENIDLREF) -dvgroot "http://wiki.services.openoffice.org/wiki" \ -name $(IDLDOCREFNAME) -lg idl -dvgfile $(IDL_CHAPTER_REFS) -t $(DESTDIRIDL) - -rm $(@:d)$/idl.css - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/common$/ref$/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/idl.css + -rm $(@:d)/idl.css + $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)/docs/common/ref/idl.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)/idl.css .IF "$(SOLAR_JAVA)" != "" -$(MYZIPTARGET) : $(BIN)$/unowinreg.dll $(DESTCLASSESLIST) - cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ..$/..$/..$/bin$/$(MYZIPTARGET:b) $(MYZIPLIST) +$(MYZIPTARGET) : $(BIN)/unowinreg.dll $(DESTCLASSESLIST) + cd $(MYZIPDIR) && zip $(MYZIPFLAGS) ../../../bin/$(MYZIPTARGET:b) $(MYZIPLIST) .ENDIF diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk index 0eb4c76b625d..825f09b7a6d3 100644 --- a/odk/util/makefile.pmk +++ b/odk/util/makefile.pmk @@ -37,26 +37,26 @@ IDLDOCREFNAME="$(OFFICENAME) $(PRODUCT_RELEASE) API" PRODUCT_NAME=odkcommon PRODUCTZIPFILE=$(PRODUCT_NAME).zip -DESTDIR=$(OUT)$/bin$/$(PRODUCT_NAME) -DESTDIRBIN=$(DESTDIR)$/bin -DESTDIRLIB=$(DESTDIR)$/lib +DESTDIR=$(OUT)/bin/$(PRODUCT_NAME) +DESTDIRBIN=$(DESTDIR)/bin +DESTDIRLIB=$(DESTDIR)/lib DESTDIRDLL=$(DESTDIRLIB) -DESTDIRIDL=$(DESTDIR)$/idl -DESTDIRINC=$(DESTDIR)$/include -DESTDIRJAR=$(DESTDIR)$/classes -DESTDIRXML=$(DESTDIR)$/xml -DESTDIRSETTINGS=$(DESTDIR)$/settings -DESTDIREXAMPLES=$(DESTDIR)$/examples -DESTDIRINC=$(DESTDIR)$/include -DESTDIRCLASSES=$(DESTDIR)$/classes -DESTDIRDOCU=$(DESTDIR)$/docs -DESTDIRCOMMONDOCU=$(DESTDIRDOCU)$/common -DESTDIRGENIDLREF=$(DESTDIRCOMMONDOCU)$/ref -DESTDIRDOCUIMAGES=$(DESTDIRDOCU)$/images -DESTDIRCPPDOCU=$(DESTDIRDOCU)$/cpp -DESTDIRGENCPPREF=$(DESTDIRDOCU)$/cpp$/ref -DESTDIRJAVADOCU=$(DESTDIRDOCU)$/java -DESTDIRGENJAVAREF=$(DESTDIRDOCU)$/java$/ref +DESTDIRIDL=$(DESTDIR)/idl +DESTDIRINC=$(DESTDIR)/include +DESTDIRJAR=$(DESTDIR)/classes +DESTDIRXML=$(DESTDIR)/xml +DESTDIRSETTINGS=$(DESTDIR)/settings +DESTDIREXAMPLES=$(DESTDIR)/examples +DESTDIRINC=$(DESTDIR)/include +DESTDIRCLASSES=$(DESTDIR)/classes +DESTDIRDOCU=$(DESTDIR)/docs +DESTDIRCOMMONDOCU=$(DESTDIRDOCU)/common +DESTDIRGENIDLREF=$(DESTDIRCOMMONDOCU)/ref +DESTDIRDOCUIMAGES=$(DESTDIRDOCU)/images +DESTDIRCPPDOCU=$(DESTDIRDOCU)/cpp +DESTDIRGENCPPREF=$(DESTDIRDOCU)/cpp/ref +DESTDIRJAVADOCU=$(DESTDIRDOCU)/java +DESTDIRGENJAVAREF=$(DESTDIRDOCU)/java/ref BINOUT=$(SOLARBINDIR) INCOUT=$(SOLARINCDIR) @@ -64,11 +64,11 @@ IDLOUT=$(SOLARIDLDIR) XMLOUT=$(SOLARXMLDIR) LIBOUT=$(SOLARLIBDIR) -CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl +CONVERTTAGSCRIPT=$(SOLARENV)/bin/converttags.pl CONVERTTAGFLAGNAME=converttags_html_files.flag -CONVERTTAGFLAG = $(MISC)$/$(CONVERTTAGFLAGNAME) +CONVERTTAGFLAG = $(MISC)/$(CONVERTTAGFLAGNAME) -MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)$/autodoc +MY_AUTODOC=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(SOLARBINDIR)/autodoc .IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" MY_COPY=$(GNUCOPY) @@ -83,19 +83,22 @@ MY_COPY_RECURSIVE=$(GNUCOPY) -urf .ENDIF .ENDIF +MY_DELETE_RECURSIVE=rm -rf +MY_TEXTCOPY=@cp + .IF "$(GUI)"=="WNT" #-------------------- # WNT ONLY #-------------------- -MY_DELETE_RECURSIVE=+del /sxyf -MY_TEXTCOPY=cat +#MY_DELETE_RECURSIVE=+del /sxyf +#MY_TEXTCOPY=cat MY_DLLPREFIX= MY_DLLPOSTFIX=.dll -MY_DLLOUT=$(OUT)$/bin +MY_DLLOUT=$(OUT)/bin EXEPOSTFIX=.exe DLLOUT=$(SOLARBINDIR) -DESTDIRCPPEXAMPLES=$(DESTDIR)$/examples$/cpp +DESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp .IF "$(COM)"=="GCC" DESTPLATFROM=mingw @@ -103,15 +106,15 @@ DESTPLATFROM=mingw DESTPLATFROM=windows .ENDIF DESTDIRDLL=$(DESTDIRBIN) -DESTDIRCLI=$(DESTDIR)$/cli +DESTDIRCLI=$(DESTDIR)/cli .ELSE #-------------------- -# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)$/examples$/cpp +# UNX ONLYDESTDIRCPPEXAMPLES=$(DESTDIR)/examples/cpp #-------------------- -MY_DELETE_RECURSIVE=rm -rf -MY_TEXTCOPY= tr -d "\015" +#MY_DELETE_RECURSIVE=rm -rf +#MY_TEXTCOPY= tr -d "\015" MY_DLLPREFIX=lib .IF "$(OS)"=="MACOSX" @@ -119,7 +122,7 @@ MY_DLLPOSTFIX=.dylib .ELSE MY_DLLPOSTFIX=.so .ENDIF -MY_DLLOUT=$(OUT)$/lib +MY_DLLOUT=$(OUT)/lib DLLOUT=$(SOLARLIBDIR) .IF "$(OS)$(CPU)"=="SOLARISS" @@ -165,67 +168,60 @@ DESTPLATFROM=freebsd DESTPLATFROM=macosx .ENDIF -#DESTDIRBIN=$(DESTDIR)$/$(DESTPLATFROM)$/bin -#DESTDIRLIB=$(DESTDIR)$/$(DESTPLATFROM)$/lib +#DESTDIRBIN=$(DESTDIR)/$(DESTPLATFROM)/bin +#DESTDIRLIB=$(DESTDIR)/$(DESTPLATFROM)/lib #DESTDIRDLL=$(DESTDIRLIB) .ENDIF -MY_TEXTCOPY_SOURCEPRE=< -MY_TEXTCOPY_TARGETPRE=> +#MY_TEXTCOPY_SOURCEPRE=< +#MY_TEXTCOPY_TARGETPRE=> INCLUDETOPDIRLIST= \ - $(INCOUT)$/sal \ - $(INCOUT)$/salhelper \ - $(INCOUT)$/rtl \ - $(INCOUT)$/osl \ - $(INCOUT)$/store \ - $(INCOUT)$/typelib \ - $(INCOUT)$/uno \ - $(INCOUT)$/cppu \ - $(INCOUT)$/cppuhelper \ - $(INCOUT)$/bridges \ - $(INCOUT)$/registry \ - $(INCOUT)$/stl + $(INCOUT)/sal \ + $(INCOUT)/salhelper \ + $(INCOUT)/rtl \ + $(INCOUT)/osl \ + $(INCOUT)/store \ + $(INCOUT)/typelib \ + $(INCOUT)/uno \ + $(INCOUT)/cppu \ + $(INCOUT)/cppuhelper \ + $(INCOUT)/bridges \ + $(INCOUT)/registry \ + $(INCOUT)/stl .IF "$(GUI)"=="WNT" -INCLUDETOPDIRLIST += $(INCOUT)$/systools +INCLUDETOPDIRLIST += $(INCOUT)/systools .ENDIF -INCLUDEDIRLIST:={$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))} +INCLUDEDIRLIST:={$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type d -print))} INCLUDEFILELIST=\ - $(INCOUT)$/com$/sun$/star$/uno$/Any.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Any.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/genfunc.h \ - $(INCOUT)$/com$/sun$/star$/uno$/genfunc.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/Reference.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Reference.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/Sequence.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Sequence.hxx \ - $(INCOUT)$/com$/sun$/star$/uno$/Type.h \ - $(INCOUT)$/com$/sun$/star$/uno$/Type.hxx + $(INCOUT)/com/sun/star/uno/Any.h \ + $(INCOUT)/com/sun/star/uno/Any.hxx \ + $(INCOUT)/com/sun/star/uno/genfunc.h \ + $(INCOUT)/com/sun/star/uno/genfunc.hxx \ + $(INCOUT)/com/sun/star/uno/Reference.h \ + $(INCOUT)/com/sun/star/uno/Reference.hxx \ + $(INCOUT)/com/sun/star/uno/Sequence.h \ + $(INCOUT)/com/sun/star/uno/Sequence.hxx \ + $(INCOUT)/com/sun/star/uno/Type.h \ + $(INCOUT)/com/sun/star/uno/Type.hxx -.IF "$(USE_SHELL)"=="4nt" -# Quoted Open Bracket -QOB -# Quoted Close Bracket -QCB -QOB=( -QCB=) -.ELSE QOB=\( QCB=\) -.ENDIF INCLUDELIST:=\ - {$(subst,/,$/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \ + {$(subst,/,/ $(shell @$(FIND) $(INCLUDETOPDIRLIST) -type f ! $(QOB) -name "*~" -o -name "*build.lst" -o -name "*deliver.log" $(QCB) -print))} \ $(INCLUDEFILELIST) SDK_CONTENT_CHECK_FILES= \ - $(MISC)$/copying_files.txt + $(MISC)/copying_files.txt SDK_CHECK_FLAGS= \ - $(MISC)$/checkbin.txt \ - $(MISC)$/checkidl.txt \ - $(MISC)$/checkinc.txt \ - $(MISC)$/checkinc2.txt + $(MISC)/checkbin.txt \ + $(MISC)/checkidl.txt \ + $(MISC)/checkinc.txt \ + $(MISC)/checkinc2.txt diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk index cc80078de4a4..6c2fa72600a1 100644 --- a/odk/util/odk_rules.pmk +++ b/odk/util/odk_rules.pmk @@ -26,155 +26,124 @@ #************************************************************************* -$(DESTDIRDOCU)$/%.html : $(PRJ)$/docs$/%.html +$(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIREXAMPLES)$/%.html : $(PRJ)$/examples$/%.html +$(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/index.html : $(PRJ)$/index.html +$(DESTDIR)/index.html : $(PRJ)/index.html @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRDOCU)$/%.css : $(PRJ)$/docs$/%.css +$(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRDOCUIMAGES)$/% : $(PRJ)$/docs$/images$/% +$(DESTDIRDOCUIMAGES)/% : $(PRJ)/docs/images/% @@-rm -f $@ $(MY_COPY) $< $@ -$(DESTDIR)$/configure : $(PRJ)$/configure +$(DESTDIR)/configure : $(PRJ)/configure @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(PRJ)/configure $@ -$(DESTDIR)$/configure.pl : $(PRJ)$/configure.pl +$(DESTDIR)/configure.pl : $(PRJ)/configure.pl @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/configure.pl $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(PRJ)/configure.pl $@ -$(DESTDIR)$/config.guess : $(SRC_ROOT)$/config.guess +$(DESTDIR)/config.guess : $(SRC_ROOT)/config.guess @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.guess $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(SRC_ROOT)/config.guess $@ -$(DESTDIR)$/config.sub : $(SRC_ROOT)$/config.sub +$(DESTDIR)/config.sub : $(SRC_ROOT)/config.sub @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(SRC_ROOT)$/config.sub $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $(SRC_ROOT)/config.sub $@ -$(DESTDIR)$/setsdkenv_unix : $(PRJ)$/setsdkenv_unix +$(DESTDIR)/setsdkenv_unix : $(PRJ)/setsdkenv_unix @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $< $@ -#.IF "$(USE_SHELL)"=="4nt" -# $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ -#.ELSE -# $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ -#.ENDIF - -$(DESTDIR)$/setsdkenv_unix.%.in : $(PRJ)$/setsdkenv_unix.%.in +$(DESTDIR)/setsdkenv_unix.%.in : $(PRJ)/setsdkenv_unix.%.in @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 644 $@ -.ENDIF + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/setsdkenv_windows.bat : $(PRJ)$/setsdkenv_windows.bat +$(DESTDIR)/setsdkenv_windows.bat : $(PRJ)/setsdkenv_windows.bat @@-rm -f $@ -.IF "$(USE_SHELL)"=="4nt" - $(TYPE) $< | $(SED) "s/__SDKNAME__/$(SDKDIRNAME)/" > $@ -.ELSE $(TYPE) $< | $(SED) 's#__SDKNAME__#$(SDKDIRNAME)#' > $@ -.ENDIF -$(DESTDIR)$/%.bat : $(PRJ)$/%.bat +$(DESTDIR)/%.bat : $(PRJ)/%.bat @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/setsdkenv_windows.template : $(PRJ)$/setsdkenv_windows.template +$(DESTDIR)/setsdkenv_windows.template : $(PRJ)/setsdkenv_windows.template @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIR)$/cfgWin.js : $(PRJ)$/cfgWin.js +$(DESTDIR)/cfgWin.js : $(PRJ)/cfgWin.js @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/cfgWin.js $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $(PRJ)/cfgWin.js $@ -$(DESTDIRSETTINGS)$/%.mk : $(PRJ)$/settings$/%.mk +$(DESTDIRSETTINGS)/%.mk : $(PRJ)/settings/%.mk @@-rm -f $@ .IF "$(COMEX)"=="7" - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< | $(SED) -e 's/stlport_vc7/stlport_vc6/' $@ .ELSE - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ .ENDIF -$(DESTDIRXML)$/module-description.dtd : $(XMLOUT)$/module-description.dtd +$(DESTDIRXML)/module-description.dtd : $(XMLOUT)/module-description.dtd @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(XMLOUT)$/module-description.dtd $(MY_TEXTCOPY_TARGETPRE) $@ -$(DESTDIRXML)$/%.xml : $(XMLOUT)$/%.xml + $(MY_TEXTCOPY) $(XMLOUT)/module-description.dtd $@ +$(DESTDIRXML)/%.xml : $(XMLOUT)/%.xml @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRBIN)$/%$(EXEPOSTFIX) : $(BINOUT)$/%$(EXEPOSTFIX) +$(DESTDIRBIN)/%$(EXEPOSTFIX) : $(BINOUT)/%$(EXEPOSTFIX) @@-rm -f $@ - $(GNUCOPY) $(BINOUT)$/$(@:f) $@ + $(GNUCOPY) $(BINOUT)/$(@:f) $@ -$(DESTDIRBIN)$/%.bin : $(BINOUT)$/%.bin +$(DESTDIRBIN)/%.bin : $(BINOUT)/%.bin @@-rm -f $@ - $(GNUCOPY) $(BINOUT)$/$(@:f) $@ + $(GNUCOPY) $(BINOUT)/$(@:f) $@ -$(DESTDIRBIN)$/regcomp : $(BINOUT)$/regcomp +$(DESTDIRBIN)/regcomp : $(BINOUT)/regcomp @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ -.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt" - -chmod 755 $@ -.ENDIF + $(MY_TEXTCOPY) $< $@ -$(DESTDIRBIN)$/unoapploader$(EXEPOSTFIX) : $(BIN)$/unoapploader$(EXEPOSTFIX) +$(DESTDIRBIN)/unoapploader$(EXEPOSTFIX) : $(BIN)/unoapploader$(EXEPOSTFIX) @@-rm -f $@ - $(GNUCOPY) $(BIN)$/$(@:f) $@ + $(GNUCOPY) $(BIN)/$(@:f) $@ # special rule for special Java UNO native library # (used for all platforms but built only under windows; # otherwise provided in external) -$(DESTDIRJAR)$/win$/unowinreg.dll : $(BIN)$/unowinreg.dll +$(DESTDIRJAR)/win/unowinreg.dll : $(BIN)/unowinreg.dll @@-rm -f $@ $(GNUCOPY) $< $@ -$(DESTDIRCLI)$/%.dll : $(BINOUT)$/%.dll +$(DESTDIRCLI)/%.dll : $(BINOUT)/%.dll @@-rm -f $@ $(GNUCOPY) $< $@ -$(DESTDIRDLL)$/%$(MY_DLLPOSTFIX) : $(DLLOUT)$/%$(MY_DLLPOSTFIX) +$(DESTDIRDLL)/%$(MY_DLLPOSTFIX) : $(DLLOUT)/%$(MY_DLLPOSTFIX) @@-rm -f $@ - $(GNUCOPY) $(DLLOUT)$/$(@:f) $@ + $(GNUCOPY) $(DLLOUT)/$(@:f) $@ -$(DESTDIRJAR)$/com$/sun$/star$/lib$/loader$/%.class : $(CLASSDIR)$/com$/sun$/star$/lib$/loader$/%.class +$(DESTDIRJAR)/com/sun/star/lib/loader/%.class : $(CLASSDIR)/com/sun/star/lib/loader/%.class @@-$(RM) $(@:db).class $(COPY) $(<:db).class $(@:d) # deal with subclasses @@-$(RM) $(@:db)$(EMQ)$$*.class -$(COPY) $(<:db)$(EMQ)$$*.class $(@:d) -$(DESTDIRIDL)$/% : $(IDLOUT)$/% - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ - @touch $(IDL_DOCU_CLEANUP_FLAG) +$(DESTDIRIDL)/% : $(IDLOUT)/% + $(MY_TEXTCOPY) $< $@ +# @touch $(IDL_DOCU_CLEANUP_FLAG) -$(DESTDIRINC)$/udkversion.mk : +$(DESTDIRINC)/udkversion.mk : @@-rm -f $@ @echo #UDK version number > $@ @echo #major >> $@ @@ -184,38 +153,34 @@ $(DESTDIRINC)$/udkversion.mk : @echo #micro >> $@ @echo UDK_MICRO=$(UDK_MICRO) >> $@ -$(DESTDIRINC)$/% : $(INCOUT)$/% - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ +$(DESTDIRINC)/% : $(INCOUT)/% + $(MY_TEXTCOPY) $< $@ -$(DESTDIRLIB)$/%.lib : $(LIBOUT)$/%.lib +$(DESTDIRLIB)/%.lib : $(LIBOUT)/%.lib @@-rm -f $@ - $(GNUCOPY) $(LIBOUT)$/$(@:f) $@ + $(GNUCOPY) $(LIBOUT)/$(@:f) $@ -$(DESTDIRLIB)$/%.a : $(LIBOUT)$/%.a +$(DESTDIRLIB)/%.a : $(LIBOUT)/%.a @@-rm -f $@ - $(GNUCOPY) $(LIBOUT)$/$(@:f) $@ + $(GNUCOPY) $(LIBOUT)/$(@:f) $@ $(DIR_CREATE_FLAG) : -.IF "$(USE_SHELL)" != "4nt" $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST)) | xargs -n 20 $(MKDIRHIER) && echo "dirs created" > $@ && touch $@ -.ELSE - $(TYPE) $(mktmp $(DIR_DIRECTORY_LIST:s#\#/#)) | $(XARGS) mkdir.exe -p && echo "dirs created" > $@ && touch $@ -.ENDIF $(DELAY) 2 -$(DESTDIRSETTINGS)$/component.uno.def : $(PRJ)$/settings$/component.uno.def +$(DESTDIRSETTINGS)/component.uno.def : $(PRJ)/settings/component.uno.def @@-rm -f $@ - $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $< $(MY_TEXTCOPY_TARGETPRE) $@ + $(MY_TEXTCOPY) $< $@ -$(DESTDIRSETTINGS)$/component.uno.map : $(SOLARENV)$/bin$/addsym.awk $(SOLARENV)$/src$/component.map +$(DESTDIRSETTINGS)/component.uno.map : $(SOLARENV)/bin/addsym.awk $(SOLARENV)/src/component.map @@-$(RM) -f $@ .IF "$(COMID)"=="gcc3" - tr -d "\015" < $(SOLARENV)$/src$/component.map | $(AWK) -f $(SOLARENV)$/bin$/addsym.awk > $@ + tr -d "\015" < $(SOLARENV)/src/component.map | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@ .IF "$(OS)"=="MACOSX" - tr -d "\015" < $(SOLARENV)$/src$/component.map | tail -n +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*$//' > $@ + tr -d "\015" < $(SOLARENV)/src/component.map | tail -n +3 | head -3 | sed -e 's/.*component/_component/g' -e 's/;[ ]*//' > $@ .ENDIF .ELSE # "$(COMID)"=="gcc3" - tr -d "\015" < $(SOLARENV)$/src$/component.map > $@ + tr -d "\015" < $(SOLARENV)/src/component.map > $@ .ENDIF # "$(COMID)"=="gcc3" @chmod 664 $@ From 9f01eba0542582fd37ce5412360d50193b8f3763 Mon Sep 17 00:00:00 2001 From: Juergen Schmidt Date: Tue, 30 Mar 2010 18:16:13 +0200 Subject: [PATCH 3/5] nativea: SDK rebranding --- autodoc/source/display/html/cfrstd.cxx | 2 +- odk/docs/images/arrow-1.gif | Bin 68 -> 98 bytes odk/docs/images/arrow-2.gif | Bin 68 -> 68 bytes odk/docs/images/arrow-3.gif | Bin 68 -> 98 bytes odk/docs/images/bg_table.png | Bin 0 -> 128 bytes odk/docs/images/nav_down.png | Bin 320 -> 224 bytes odk/docs/images/nav_left.png | Bin 279 -> 223 bytes odk/docs/images/nav_right.png | Bin 283 -> 225 bytes odk/docs/images/nav_up.png | Bin 282 -> 211 bytes odk/docs/images/odk-footer-logo.gif | Bin 0 -> 850 bytes odk/docs/images/ooo-main-app_32.png | Bin 2271 -> 2429 bytes odk/docs/images/orc-main-app_32.png | Bin 0 -> 2496 bytes odk/docs/images/sdk_head-1.gif | Bin 10949 -> 0 bytes odk/docs/images/sdk_head-1.png | Bin 0 -> 12367 bytes odk/docs/images/sdk_head-2.gif | Bin 58 -> 0 bytes odk/docs/images/sdk_head-2.png | Bin 0 -> 175 bytes odk/docs/images/sdk_head-3.gif | Bin 1528 -> 0 bytes odk/docs/images/sdk_line-1.gif | Bin 51 -> 43 bytes odk/docs/images/sdk_line-2.gif | Bin 66 -> 113 bytes odk/docs/images/so-main-app_32.png | Bin 2323 -> 0 bytes odk/docs/install.html | 24 +++--- odk/docs/notsupported.html | 5 +- odk/docs/sdk_styles.css | 9 ++- odk/docs/tools.html | 36 +++++---- odk/examples/DevelopersGuide/examples.html | 89 ++++++++++----------- odk/examples/examples.html | 62 +++++++------- odk/index.html | 58 ++++++-------- 27 files changed, 142 insertions(+), 143 deletions(-) create mode 100644 odk/docs/images/bg_table.png create mode 100644 odk/docs/images/odk-footer-logo.gif create mode 100644 odk/docs/images/orc-main-app_32.png delete mode 100644 odk/docs/images/sdk_head-1.gif create mode 100644 odk/docs/images/sdk_head-1.png delete mode 100644 odk/docs/images/sdk_head-2.gif create mode 100644 odk/docs/images/sdk_head-2.png delete mode 100644 odk/docs/images/sdk_head-3.gif delete mode 100644 odk/docs/images/so-main-app_32.png diff --git a/autodoc/source/display/html/cfrstd.cxx b/autodoc/source/display/html/cfrstd.cxx index 3bf56afb07cc..3b45576c17ae 100644 --- a/autodoc/source/display/html/cfrstd.cxx +++ b/autodoc/source/display/html/cfrstd.cxx @@ -338,7 +338,7 @@ MakeCopyRight() cr << "Copyright © 1995, " << year - << ", Oracle and/or its affiliates. All rights reserved."; + << ", Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners."; return String(cr.c_str()); } diff --git a/odk/docs/images/arrow-1.gif b/odk/docs/images/arrow-1.gif index e58046ae9d5a4ffe9c769dca6605f6b707ddce12..99da8a7d5b0fefd20e9661a44333e151f0c56353 100644 GIT binary patch delta 60 zcmZ=sGIRHIv#?AQVBlqFU}WHHJ^TOvf5m@N&PAz-C8;S2<(VZJ3hti10Sftf3W*B7 QiOCF#KUo;LCQ9f409rv4M*si- delta 30 mcmYdtk#P5Pv#?AQVBlqFU}Pwp_T>Nn|B63Z7#Sv-=>PzV8VUpe diff --git a/odk/docs/images/arrow-2.gif b/odk/docs/images/arrow-2.gif index 94e7a2673e9e70335303ed7a2185114b86146568..2e2b20d7d325129782729f1de0c2823bad602e10 100644 GIT binary patch delta 30 lcmZ>9k#P5Pv#?AQVBlqFU}X5u!0`Y7f5o3Hj9e2XbO3v@2;l$# delta 30 mcmZ>9k#P5Pv#?AQVBlqFU|`s^hvEPK|B63Z7#Su?=l}qK&Nn|B63Z7#Sv-=>PzV8VUpe diff --git a/odk/docs/images/bg_table.png b/odk/docs/images/bg_table.png new file mode 100644 index 0000000000000000000000000000000000000000..eb5d4f2f73819b7ec85dafbac13296025895da4b GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrA!2~3KZCES|5-1LGcVbv~PUa<$!&%@FSFVdQ&MBb@0E(g?82|tP literal 0 HcmV?d00001 diff --git a/odk/docs/images/nav_down.png b/odk/docs/images/nav_down.png index 4f2cf361a3dd712551e82855753c011be7a06c2f..fee3fbf30beab68f03679bdc4fa7703844a86f44 100644 GIT binary patch delta 196 zcmX@W^nh`KNGZx^prw85kHi3p^r=85p>QL70(Y)*K0-AbW|YuPgg4W(h8N zLz{eQYoJh(r;B5V#p&cf|Nq-FZ)M`J(@;bDpd_qH!C z8om#MPP?pOb9%%B1U)Bia?W>(VYtcebEK+wf@6g3Ue7g+H?9~8uAU%KsTO4VU~@;O vh`0bx)Bpefg^$#%P5&>vxNqVtRb2+lr*<{an^LB{Ts5w|Yl| delta 293 zcmaFBcz|hwNa>QWZRN6Vp?J zQWH}u3s0un02N*Gba4!+xRvzh|9^YttqcwfhC)VbYJLUBOYAldt}?dU%D{NUsik%H z1l{Ay1r!=)NUY#sVCq=a#>gTN%FE25uu6(ez#+txN1>s9MV5pE!$yUr>Q7jnx9j^l zUcRTc5d&k(>D1X1gthIOConoNEPTRXa=kIOW0~Mw{&Ge8v<1?jiL@d8P+INKUn1TO#p002ovPDHLkV1l5AOGW?y delta 251 zcmcc5IGt&NNa>QWZRN6Vp?J zQWH}u3s0un02QtDba4!+xRvzh|9^YttqcwfhC!DN8W@x^B7S~Zp1?YH=B1t%9%c>& zwIm)TF$NX^;jKJOj13G)N|zMulRy$Z28YuG4EC4_mn2I#Ff5dC>vU9L5O63se1cQC z#G8?+qmzs6AS2LR!P#vcj0}t}R}Fx=RvlAwU`Rac_e6?Az#&3dcbdT+m!8uMOdRQD wO6oyCI^RwGszU?AqO3|b0f!J%9)$x8T3*4wWhN#H16|GF>FVdQ&MBb@06?lu+yDRo diff --git a/odk/docs/images/nav_right.png b/odk/docs/images/nav_right.png index 6b8c2185b2c34022d017d3c939536d32d5bd76a9..87310372a2f60a797efe70b2dfb75354b6289b94 100644 GIT binary patch delta 197 zcmbQu^pJ6aNGZx^prw85kHi3p^r=85p>QL70(Y)*K0-AbW|YuPgg4W(h8N z`3F12z5s=aJzX3_EKcvea#8Sr0ta(I0%Q5h3fTi6?<^Hw5`XXO;;a=rjSd($ya>QWZRN6Vp?J zQWH}u3s0un02QtEba4!+xRvzh|9^YttqcwfhC!DN8W@yLZTR%k|6rGu@lwf;E15YI z)Pi!_B)hm7SOkPu#vM#oa9|M3o*{3@#>66UQINspfVf9Ru9KKEzcWy;rWvOshk!%E z;SHKftOs~lfV#7m=toEZ)rRsk@8nTvSRs|h!02-I22d(#v#?{c1A{_C2d{AxTO-H? x6Qyt50MUV`6$BVK6jn`32PzId%)rFMaEIUb_i46IlYlN~@O1TaS?83{1OV}JPuKte diff --git a/odk/docs/images/nav_up.png b/odk/docs/images/nav_up.png index 5576317aa47deb50c0be05cd90aacae23384570f..8267ada19789d1e6663b2e7927e7c14bd49c45aa 100644 GIT binary patch delta 183 zcmbQmbeVC2NGZx^prw85kHi3p^r=85p>QL70(Y)*K0-AbW|YuPgg4W(h6@ z_SM`=<^hFLJzX3_EKVo?`TyUZc`JjkVb_n_=l(A5N;GKhFr3gSA}(k&p)+LtL*ogZ za|{lto_EPhNDe;k(&xD2it$6^7s*ovmF?_y+07AbFz{8jD`W!#u_O_}Yz1Lv(Ss`z h51%w}%bK=@!GOtl@}!1Y%s?9%JYD@<);T3K0RUV!J)Qsn delta 254 zcmcc2IE!h5Na>QWZRN6Vp?J zQWH}u3s0un02QtAba4!+xRvzh|9^YttqcwfhJuS%)cguwl*7WIpq9j|bj+cFAxY_| zYYPuZAZTyfd9Z+bPr*rM76IX%jlI6IAYB3F58C_t*U2d~%=jRAWv1p{$w-D%$1@ci z7#?;p@HBsrjq(g9i6wuhD1xgGY3ag~p1RO$4c@!E}WJx$M1YR|0 wU|6&&5vba!Man*jmzhJsEo<5q21Yi9iMyS0r`?a;33NDvr>mdKI;Vst0HgU;ApigX diff --git a/odk/docs/images/odk-footer-logo.gif b/odk/docs/images/odk-footer-logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..e79cd7143ac352b0d465860e9e6c7522c1041220 GIT binary patch literal 850 zcmV-Y1Fif=Nk%w1VU_?g0J9GO|1dEBP*DHR&;P%_|8Q{s-{1d#fB&zq|DT`#kB|RA zK>uK1|L^br5D@<$ApigWA^8LW000jFEC2ui0G0qU000F4@X1N5y*TU5yZ>M)j$~<` zXsWJk>%MR-&vb3yc&_h!@BhG{a7Zi~kI1BQ$!t1Jji_`=ty-_xtai)A3LB2FcuX#v z&*-#z%{DiL4zN5v4y*ubQ3|mE3ktKfad3G62Mol;#taFU2FJ_>ld7x4 z1FB+R2+YL@4FwDYlX?vS1K7k0!pTuzs0{$z3<3fJ@$>G}4a*Gj`tk1GuL8xK)oDkp zz&?2g;sEqVtr~%1^Y%GYkidYdO_=}|2!Le)F>TBL1YEgR;1#}M3{I&U$AIG%2Mgy= zV<+vDl`sH&IlvglBLfBB@-%qJz`?QsLFFhQ1`Pl)X8@5#2~aNSzix%rHMk}cQ$t2S zW+q^8;F+6kEgwp)GPdN(cTgI&R#U}I00IOD01G~VZl=0R!?exB6K5O& zwGI*tI6(OTOMyeHM!A-9E7`1!6=K~>#~r!RW5D`YH&$xu*Te!m6bS&}F>ReblHpc1 zq}jb-V!A2>P{8Bk#}|Muv`Hy3K;0l?YWQ8}I&IFsX(BlTk?)h8eS830-2KrQkSw2>_r5wea0ES>gI6d^%^ zk39|$Q`T<>P8cCJ0yq#JHUT&#VFG5U)&ppl5MUcN13+gTQq?rz(*OXp#a(JP#x~T8 z$M`4VhLMd}&}%ypLRuy{9oS?ht_%mpleH}OiZ4<)sb!ToHR&af?0AXgD=PBP(3#)t zu_P+Pef1if_+n5L1SfEStcm1#exvs_U-2 c_Uh}ezy>Squ*4Q??6JrutL(DO&Kdy#I|kl`Q~&?~ literal 0 HcmV?d00001 diff --git a/odk/docs/images/ooo-main-app_32.png b/odk/docs/images/ooo-main-app_32.png index f2e6e9e4d4510896cd140369b10700fc11bec806..296c6f4c58b1bb4022151f09d7e11a1f93ecba8e 100644 GIT binary patch delta 2419 zcmV-(35@pN5&aU7BYz1*Nklz(M$F5(s^B5-u6u1i@^A? zBj$mRf9bBy zy@lx$d*@<*foyN+Ku`Ug`#jQ17-RsaJvkA_Ngs1O);sD+C2a2?|~z^GY+#X{4SwvII3Hjk*pu zZRIOt|9|@U(ppTn23)rP++%}rPxZ@v>q~ZaDJ}eJ1;dn51PRKc_lNi+3anOtO3 z?bM(Jlk}4b%?Ui^wOBa&HnBkdn&+ACU7@TswCVt*{gIcywb1)8A9z@-iGmR# zYe^O6o1SiG2|=-|F)xU$gtFi|I| zLXj&lmg2(-!x&UV*4?t{PQW=J!he{uqAMx=%~Wd&3n3ArbPB025Y(1{UYOK*v( z#gsG;T$!qqWs3L3o-(@#>i;aGMW=oC6gSZ5qO7sL&zOb?0>K>!U*J9 zhWDP>z=OBDpYAf4?}*e_ov7<;%4~0fc6K?k0dUNm=jP zy?*J(K5!d7<(S%Klc2V_pu<=XdO{lUmD|LM`u zP~Nc30~^=YNJz{S#2H9v%udox1GPnUVR-hxz_HA9%<{C9~v(H^%3A;rt}e zof@Ou5wT~Wy9fv)oS&%ksiWtZUdkx-bmQU}MT(LgAOt1%N}dJMERdxh^-3f{oXyqF zef2YctUkY189bDlcAK;?d*=9mMe`$PJ0e5mB21}*D^-|n34ee7jf;HpnbRybGH%ow zJo@Z88o5&HsK9%JK$so7 zJic|`gAa*I;ye`Hj@TF*#ax?S^Yh+GrJ zG=pK;TTB$ADuu7T7GK?#JX^8U6Y@ZWP)-pdZ`RKObCtnEx=H|8QK4C% zcw;V(T-v|muDgwO&a0AZzz2$cP^9PsgW^Ld4w)}faetl%(%h409@Ri%pgS>iq_wFR zpE~k~jj53nz(n=%P`+BrRtU6Rkps&!mrst(UB5W8bMO5JqBuze(6-EZzQ)hFw%0(O z6)H$j98h+KuE?m&ynf+3U;Nl(&DpUNz%`(?wkdr}SKM|*3M@8euFs5~{MPA#t+#IK z?%TX6iGPeS+Rl0^7{F-TP@F&_1#nMdwWO`ajT8U)5C8qQpZUv>r>B7HK=X%ZgLfND z1n2~+z^rvIneuuZ}NJwQJ&0Bl^h{R7*3ciz3Nzij%x%}Lj~9?e_nQhjNDa`fWp&2#^8 zskJaY0Zanp6pd$HRXzOwhf@I}pbS*n)&+F52`Z2Q%fMpW>J)MA-)lI1PXh0vO4MFW ln?Puj$bj%pGvK>j{{x~B^K=?~G`#=-002ovPDHLkV1iV!&(Qz? delta 2260 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 KMNUMnLSTZmkLjWS literal 0 HcmV?d00001 diff --git a/odk/docs/images/sdk_head-1.gif b/odk/docs/images/sdk_head-1.gif deleted file mode 100644 index 53bf8a54685aac189fac4441329ff67ea154fa18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10949 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 literal 0 HcmV?d00001 diff --git a/odk/docs/images/sdk_head-2.gif b/odk/docs/images/sdk_head-2.gif deleted file mode 100644 index 7fe80c4e48ceb4c076f259a0cfd68219b79e7356..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58 zcmZ?wbhEHbWMs%?n8?8J?c4V|cOU%!|DS<@LGdRGkYr%c0TCd11}1KvmX)X9@-Lnv J(!#`G4FEzJ5&8fC diff --git a/odk/docs/images/sdk_head-2.png b/odk/docs/images/sdk_head-2.png new file mode 100644 index 0000000000000000000000000000000000000000..61adc6f7c974cf31f1ee233a8132a9fd010ec87b GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^j6ht$!2~4tMDbq-2^0spJ29*~C-V}>;VkfoEM{Qf z76xHPhFNnYfP(BLp1!W^x0ofkB-l<**7yt*k}PqJC~?lu%}vcKVQ?-=O)N=GQ7F$W z$xv|j^bH7aCryoUVYQC|3~ycg{%H-UHBK#V z8BOK~4C%JfT-&Wss<-P|N{P|{ZW>{|x#F3;s8v?nDw|$Zr&O%7#*}#tlHoaRX}i2< zOuZ<8o1Uv6y=j!AWsR$)s_nn}_^D+)qtVBN+ z7y%#msn{Ity(ZDC+0C+cd3v>|fFZrxB*|}-JZP3SK3Aqz2uqmqjZI@(<@&_J7UPBL z-eXBsr=s|YEWJv|Sy*lF=RXg(ZpF))P391IyM$NRBF(7eO)hM)=fH8Uc4&69 zxnH#|H&k~j`bPOFrM%pF@jOpwu~>lr_um)5>rwwoyx;TvCjhJk*nxE?x77@0p&UPo zWVg`+NjT523No{H_^#{Go6Brw-DrVFV7_~3d;M4u@f;&^ti564k0V#dD?*<(PL=xx z`T0u+FynS!UtNhvD9lFK9ZW4IQwpT{4-iT6TQEV$F{H? zzMJ?4ee!y6df?5F{A63MVssZ#GGce54p?Tzp7H~0e%TmxMjOo?6Eg^F>>WfFHG!-a z47i>1zaRPLRfq@H`|#hO4=Jh}V_<`lV()0QM@%y5W5WXkDgcu>L>Fl3*e~surLd<@ zw3SVy6XLZ`&X1_Qy0)kn30WC$bBU)P9?4;i;L1JSEJpxwCa~ekWZid1Q8HOjkt2;O#pXYKGnRg_rPy z4*0?@=wAT|J$?7u`ch&jIhhbli*iAHaF7TKg39*7na!P(eFMa3tPvsY zJ)GYLB-zYUX#K;PUDsT8$1Y`EjlKO)Q<(_rKzsmEAwzq_2axu-Y86Kv($euetVk|# iw`Oj*`i!E&PfQ)dM}QGztMixQj&sgR0z&+OQ~v;W4Udih diff --git a/odk/docs/images/sdk_line-1.gif b/odk/docs/images/sdk_line-1.gif index cf04e12891cdce1a6f1f5f316810bfca7fc2dae3..199d3a80bc88e63624b081b9aafd8f7fdf4dcd0b 100644 GIT binary patch literal 43 ucmZ?wbhEHbWMp7tSjfOIf60>bmoEMP{~yTEVE_V>%7tQD|U0Qdo8(@x9#Dav#;i#d;K2=Q2Zz5T$Gwv ulA5AWo>`Ki;O^-gppc)Zkf`9Bn9QKV00bbD8CW<3WCe~W99_V{U=0AK2sQKo literal 66 zcmZ?wbhEHbWMtrCSj50kKkwO!z3*b0?@wO$YR}nE*?kXB-}w6f|9{1wEDRu^10q0b R8JO8C)L4a&%wb`$1^}V~7&8C> diff --git a/odk/docs/images/so-main-app_32.png b/odk/docs/images/so-main-app_32.png deleted file mode 100644 index e79033ffe1ea743d52562a59aabbb2be70dbec7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2323 zcmWj_Ygm$p`s4bcexQUGm?oH+mQE2$JH-Ul)E1RFdq(LKpCnSV(zHyQ3P@UZbPXh2WbHozH z*25W6Ns1&Rv*>7_gaZJCZ@0$tQwyJqJ@3ryXOQDDM}2(2)74G2AQc(b^d+5e^n^PgBO-54DWe(UmqG8(5+e> z+|LN>-FX=`eF{g7$KrUTWOQB~fIf2oROipJ9JYmWI`xZLPI~&=z3a|Gd6!o}Zx1y? z=g*&y-^@#`y2KX<%+t> z%8*3)u$;i`TD_$_BUS*Q;(x+89F7MM%$93^8Y~gN-*r4>l@uZhzUONS2`1$Jc$>{+ zv&oY{@&_K^8zo8(tm;H@cO#BvQ}@6?-wR>GAalR*V|*zp27eIV3ri-&W3Y5TP~Is! zP_S&7=2nCAYnZ2MjSP`k-!Dgp)GIbP7VW3`9@O2mb_xs=5jpZyRGwZ7;$UAK&8$ZLxx9=q%rAa-rlVyQgMcuKKH7A?3EO(*CQJ95ZjcsJ;y_;+8=uI0opUpj zAn46%%bi)FY`Mx(es_DNvhhL?1_Z%Tes=V<*gU%c7h(iI(YZ48=7q(nJB)W0g_X<$ zZjJR>1e%W0T~^C<&brXha~0pWM2(mt4BC!D#2A?VP5XIIovrd6)Xw<>${S9B=$c}Q zb>U^OZt4V`x<+3+$O!llbAC=UrjpqgKGX%mkK65Lm!|imki*V$yZwR&tD_t?TYz4lP+sC#r#9Uz5c$O}$7T9c1)9 z>SW%!RTiKf!NrX{o#tx2OR(c?pYX^-f8MI$$H!ha1~U^mMKfoO-F8q_2qrv8tT4z* zmE#CD1nZn8oNyDIc~>OjrXh>7YfsNSb*E9{vJ*rn65&6dvk5>b; z6SmiKlnPPm*T!jCf?DbSQOSMtcz?F)R}Ez7kV&l;3;l*)2VvOFIn3I(<>Jx72>PVM zVXF%q(6vNLW4VoAeNXNjey20F!eFsu;eyc=0n>nELpiEo4NAG>qxNgFn8`YK2EDdH zdl4whSB-&@&M@oJ61<*q!c{jpu)?cf_vleaHWFF!?GI1boYEyosJ5ZjY^1^a5Ga^kr=bgp8h z*;ffr(fnAIj!(>u{=i`P@o{gFn;Y`2|eg=pG7&}nnZAZyuZ`8hh>izr;e!ih@ zZOJIFO&p%+HY%H26~x%4DYldJBXnxYNIq@pWN_ryn~qnYslEcHpNXhcumvU z>AKG16Q15}25S%OE4Av?M_zhY{G9!S{o406YgCxVw4VH&<;N*LWqdMH!!zV|uIs7q z&2siQ)5lhW8;;?Hg{%r8wEUOHhzfN3JiYDGAdds8Wznl9&eRx%YSSo#4<>`gPKc)L^ zf1^>Ya1}P9C={j)!Ocns8U`6*Yx}jBu!?62;`Zbc#62nhXnv#(yUF^$ITPe_7#ysq(a*Npl2%;tTq2zEP!ZFerXr8M3Zc;X;|P{+=DpYDa9} z@YDBtk1{eai9}%ot-8RWm?~c5?X9LG%5zU;Dl-Q6&OI|9g(jq~D04-VVvZb91<7Wr zHzL~iAAv)sRe2c?t`ed9DL;#dcOFHtL?SW0 znurY#QF|4^pxLdGIlsM5rwtD4*7iLh?xIW>)0x?{5#>`(+pW^ue8M#LE*%SEnk1}>G&___J?hDu-0Un@8pRcd%&DxN( zvaS7=`df9>{V`nbN3CYOsZ<)0+ABvkD<|$P|kBidNg=#v`NqFCnetl$DKmG zQ#FdaZ`gsOWPPgct*RMx4H6szyPh*+oVNXP38NJ<%qw6+ird`WtRhZ<6Mn~xWCyMb mOh`a678Iv8QZPI@3b?SUBvH4spw0Q!09&{0h;NC7%l;3K_6bV> diff --git a/odk/docs/install.html b/odk/docs/install.html index e11440538bb5..21611d2abdf7 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -1,6 +1,6 @@ - [TITLE] - Installation Guide + OpenOffice.org 3.2 SDK - Installation Guide @@ -8,9 +8,8 @@ - - - + + @@ -37,16 +36,16 @@
- + @@ -116,7 +115,7 @@ the 4NT shell. You have to use the native w32 version. - + @@ -219,7 +218,7 @@ the output is generated in the SDK directory itself. If an output directory is specified, the output is generated in a SDK dependent subdirectory in this directory (e.g. <OO_SDK_OUTPUT_DIR> - /[PRODUCTNAME]/LINUXExample.out) + /OpenOffice.org 3.2/LINUXExample.out) @@ -238,7 +237,7 @@ - + @@ -407,7 +406,10 @@
-

The [PRODUCTNAME] SDK comes with a set of development tools, base +

The OpenOffice.org 3.2 SDK comes with a set of development tools, base libraries, header files and helper class files that can be used to - develop Java/C++ components, to embed the [PRODUCTNAME] application in + develop Java/C++ components, to embed the OpenOffice.org 3.2 application in your own programs, or to use the API (scripting or remote control the office). For a complete working environment, we have some additional requirements:
[PRODUCTNAME] installationOpenOffice.org 3.2 installation The SDK works on top of an existing office installation and uses the same libraries as the office installation.
SDK_AUTO_DEPLOYMENT
-

Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.

+
+

+ Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

+

diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html index ce02acedb3c0..446e83200762 100644 --- a/odk/docs/notsupported.html +++ b/odk/docs/notsupported.html @@ -1 +1,4 @@ - [TITLE] - Not supported page

This page is currently not supported!

Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.
\ No newline at end of file + OpenOffice.org 3.2 SDK - Not supported page

This page is currently not supported!
+

+ Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

+

diff --git a/odk/docs/sdk_styles.css b/odk/docs/sdk_styles.css index a3fdd7b199ef..9a02576bc130 100644 --- a/odk/docs/sdk_styles.css +++ b/odk/docs/sdk_styles.css @@ -1,7 +1,7 @@ a { text-decoration: none; } -a:link { color: #C44B01; } +a:link { color: #0e85cd; } a:visited { color: #638093; } -a:active { color: #9DCA12; } +a:active { color: #4dadea; } .sdkbody { background-color: #FFFFFF; color: #000000; @@ -109,7 +109,7 @@ a:active { color: #9DCA12; } font-weight: bold; } .thead { font-weight: bold; - background-image:url(../docs/images/bg_table.gif); + background-image:url(../docs/images/bg_table.png); backgorund-position: middle; } .navigate { border: 0; } @@ -124,4 +124,7 @@ a:active { color: #9DCA12; } .content80 { width: 80%; } .content87 { width: 87%; } +.centertext {align:center; text-align:center; font-size: 12;} +.oraclelogo {vertical-align:middle;} + diff --git a/odk/docs/tools.html b/odk/docs/tools.html index b02265dfb488..8b9d604e7143 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -1,6 +1,6 @@ - [TITLE] SDK - Development Tools + OpenOffice.org 3.2 SDK SDK - Development Tools @@ -8,9 +8,8 @@ - - - + + @@ -128,7 +127,7 @@ - + @@ -146,7 +145,7 @@ office installation. UNO packages are UNO components (single libraries or Jar files or more complex zip files that contains one or more libraries| Jar files, type libraries and configuration items), scripts and - [PRODUCTNAME] Basic libraries as zip package. 'unopkg' is not part of the + OpenOffice.org 3.2 Basic libraries as zip package. 'unopkg' is not part of the SDK but comes with the office directly and is a development tool as well as an end user tool to deploy extension into an office installation.

More details concerning deployment and this tool can be find in the @@ -237,7 +236,7 @@

- + @@ -339,7 +338,7 @@ - + @@ -414,7 +413,7 @@ - + @@ -504,7 +503,7 @@ - + @@ -582,7 +581,7 @@ types the specified types depend on.

- + @@ -676,7 +675,7 @@ types the specified types depend on.

- + @@ -803,7 +802,7 @@ types the specified types depend on.

- + @@ -866,7 +865,7 @@ types the specified types depend on.

- + @@ -920,7 +919,7 @@ types the specified types depend on.

- + @@ -967,7 +966,7 @@ types the specified types depend on.

- + @@ -1081,7 +1080,10 @@ types the specified types depend on.

-

Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.

+
+

+ Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

+

diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html index da1453107f49..1a48788f0991 100644 --- a/odk/examples/DevelopersGuide/examples.html +++ b/odk/examples/DevelopersGuide/examples.html @@ -1,6 +1,6 @@ - [TITLE] - Developer's Guide Examples + OpenOffice.org 3.2 SDK - Developer's Guide Examples - - - - + + + @@ -138,7 +134,7 @@ Presentation Documents @@ -198,7 +194,7 @@ Content Broker (UCB) + src="../../docs/images/sdk_line-1.gif"> href="./FirstSteps/FirstUnoContact.java" title="link to FirstSteps/FirstUnoContact.java">FirstUnoContact @@ -246,7 +242,7 @@ different process space. href="./FirstSteps/FirstLoadComponent.java" title="link to FirstSteps/FirstLoadComponent.java">FirstLoadComponent +component into OpenOffice.org 3.2 by a Java application. + src="../../docs/images/sdk_line-1.gif"> +of losing connection to OpenOffice.org 3.2. @@ -368,7 +364,7 @@ shows the usage of office_connect.cxx +OpenOffice.org 3.2 using C++. @@ -770,7 +766,7 @@ for the image shrink component and instantiates it. + src="../../docs/images/sdk_line-1.gif"> @@ -962,7 +958,7 @@ and it's actions. href="./OfficeDev/DesktopEnvironment/FunctionHelper.java" title="link to OfficeDev/DesktopEnvironment/FunctionHelper.java">FunctionHelper @@ -977,7 +973,7 @@ asynchronous events from UNO oneway calls. href="./OfficeDev/DesktopEnvironment/IShutdownListener.java" title="link to OfficeDev/DesktopEnvironment/IShutdownListener.java">IShutdownListener +clean up on shutdown of OpenOffice.org 3.2. @@ -1039,7 +1035,7 @@ the application is registered as an event listener. href="./OfficeDev/DesktopEnvironment/ViewContainer.java" title="link to OfficeDev/DesktopEnvironment/ViewContainer.java">ViewContainer +side on OpenOffice.org 3.2 shutdown.
[PRODUCTNAME] Basic and + title="link to the Basic And Dialogs examples">OpenOffice.org 3.2 Basic and Dialogs
Shows how to initialize UNO and -get a remote office service manager from a running [PRODUCTNAME] in a +get a remote office service manager from a running OpenOffice.org 3.2 in a different process space.
Demonstrates how to load a -component into [PRODUCTNAME] by a Java application.
href="./ProfUNO/InterprocessConn/ConnectionAwareClient.java" title="link to ProfUNO/InterprocessConn/ConnectionAwareClient/.java">ConnectionAwareClient Implements a client which is aware -of losing connection to [PRODUCTNAME].
href="./ProfUNO/InterprocessConn/UrlResolver.java" title="link to ProfUNO/InterProcessConn/UrlResolver.java">UrlResolver Builds a connection to -[PRODUCTNAME] using the URL given on the command line. This example +OpenOffice.org 3.2 using the URL given on the command line. This example shows the usage of XUnoUrlResolver. Builds a connection to -[PRODUCTNAME] using C++.
href="./Components/DialogComponent/DialogComponent.java" title="link to Components/DialogComponent/DialogComponent.java">DialogComponent.java Implements a component accessing a dialog created - with the [PRODUCTNAME] Basic IDE. The component provides methods that + with the OpenOffice.org 3.2 Basic IDE. The component provides methods that can be bound to dialog respectively control events .
This is the main part of a demo application based on the framework APIs. It mainly shows the mechanisms to load, store and convert documents, as well as dispatch and dispatch -interception. It integrates windows from [PRODUCTNAME] via system +interception. It integrates windows from OpenOffice.org 3.2 via system window handle. This is the same mechanism as used by the OOoBean, but the OOoBean itself is not used here, just the JNI window handle access.
This helper comprises all -[PRODUCTNAME] API calls. Thus it is possible to learn about these +OpenOffice.org 3.2 API calls. Thus it is possible to learn about these aspects separately from the rest of the application example.
This is a listener interface to -clean up on shutdown of [PRODUCTNAME].
href="./OfficeDev/DesktopEnvironment/OfficeConnect.java" title=" link to OfficeDev/DesktopEnvironment/OfficeConnect.java">OfficeConnect Builds the remote bridge to -[PRODUCTNAME] and exports its UNO service manager for the Java side of +OpenOffice.org 3.2 and exports its UNO service manager for the Java side of the application.
Performs a clean up on the Java -side on [PRODUCTNAME] shutdown.
@@ -1058,7 +1054,7 @@ side on [PRODUCTNAME] shutdown. href="./OfficeDev/OfficeConnect.java" title="link to OfficeDev/OfficeConnect.java">OfficeConnect Builds the remote bridge to -[PRODUCTNAME] and exports its UNO service manager to the Java side. +OpenOffice.org 3.2 and exports its UNO service manager to the Java side. href="../../docs/common/ref/com/sun/star/frame/XTerminateListener.html" title="link to the reference documentation of com.sun.star.frame.XTerminationListener"> XTerminateListener. It is called -when [PRODUCTNAME] terminates. +when OpenOffice.org 3.2 terminates. @@ -1180,7 +1176,7 @@ of formats. href="./OfficeDev/Linguistic/LinguisticExamples.java" title="link to OfficeDev/Linguistic/LinguisticExamples.java">LinguisticExamples A short example that uses most of -the functionality from the [PRODUCTNAME] linguistic API. +the functionality from the OpenOffice.org 3.2 linguistic API. + src="../../docs/images/sdk_line-1.gif"> + src="../../docs/images/sdk_line-1.gif"> + src="../../docs/images/sdk_line-1.gif"> Helper Contains a helper class for the -other examples to connect to [PRODUCTNAME] and open or create a drawing +other examples to connect to OpenOffice.org 3.2 and open or create a drawing document. @@ -1735,7 +1731,7 @@ text styles in shapes. + src="../../docs/images/sdk_line-1.gif"> Helper Shows how to connect to -[PRODUCTNAME] and create text, drawing or spreadsheet document. This +OpenOffice.org 3.2 and create text, drawing or spreadsheet document. This class is used as a helper class for the other examples. @@ -1853,7 +1849,7 @@ changes. + src="../../docs/images/sdk_line-1.gif"> [PRODUCTNAME] Basic and Dialogs examples + name="BasicandDialogs">OpenOffice.org 3.2 Basic and Dialogs examples + src="../../docs/images/sdk_line-1.gif"> href="./Database/CodeSamples.java" title="link to Database/CodeSamples.java">CodeSamples Creates the connection to -[PRODUCTNAME] and executes the code SalesMan samples for database API. +OpenOffice.org 3.2 and executes the code SalesMan samples for database API. + src="../../docs/images/sdk_line-1.gif"> + src="../../docs/images/sdk_line-1.gif"> + src="../../docs/images/sdk_line-1.gif"> href="./Config/ConfigExamples.java" title="link to Config/ConfigExamples.java">ConfigExamples This example connects to a -[PRODUCTNAME], gets the configuration manager and accesses the +OpenOffice.org 3.2, gets the configuration manager and accesses the configuration in various ways. @@ -2687,7 +2683,7 @@ configuration in various ways. + src="../../docs/images/sdk_line-1.gif"> + src="../../docs/images/sdk_line-1.gif"> + src="../../docs/images/sdk_line-1.gif"> + src="../../docs/images/sdk_line-1.gif"> -
-

Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.

+
+

+ Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

diff --git a/odk/examples/examples.html b/odk/examples/examples.html index 395c59682b2a..12758ea3100d 100644 --- a/odk/examples/examples.html +++ b/odk/examples/examples.html @@ -1,6 +1,6 @@ - [TITLE] - Examples + OpenOffice.org 3.2 SDK - Examples @@ -9,9 +9,8 @@ - - - + + @@ -39,10 +38,10 @@ - + + the API from OpenOffice.org 3.2 Basic. @@ -107,7 +106,7 @@ - + @@ -215,7 +214,7 @@ - @@ -299,7 +298,7 @@ - + @@ -451,7 +450,7 @@ - + @@ -461,7 +460,7 @@ @@ -202,7 +189,10 @@

The SDK provides a rich set of examples in different programming - languages (Java, C++, [PRODUCTNAME] Basic, OLE) to illustrate the use + languages (Java, C++, OpenOffice.org 3.2 Basic, OLE) to illustrate the use of the API and demonstrate how to benefit from the included word processor, spreadsheet, presentation software, graphics program and - database of [PRODUCTNAME].
+ database of OpenOffice.org 3.2.
Some fo the examples need a running office instance listening on a port. If this is necessary you will get further information in the makefiles.

@@ -84,9 +83,9 @@
[PRODUCTNAME] Basic examplesOpenOffice.org 3.2 Basic examples Small set of examples which shows the use of - the API from [PRODUCTNAME] Basic.
ChartTypeChangeThis class loads an [PRODUCTNAME] Calc document and + This class loads an OpenOffice.org 3.2 Calc document and changes the type of the embedded chart.
Object Inspector The Object Inspector is primarily an auxiliary tool for the developer, which can present information about an object of the - [PRODUCTNAME] API at run-time. Depending on the object to be inspected, + OpenOffice.org 3.2 API at run-time. Depending on the object to be inspected, appropriate methods, interfaces, services, and attributes can be displayed to the developer. The methods, interfaces, services and attributes are represented in a predictable tree. If the attributes contained in an @@ -363,7 +362,7 @@
- + - + - + - + - + - + - + - + - + - + - + @@ -671,7 +670,7 @@ - + @@ -737,7 +736,10 @@
[PRODUCTNAME] Basic examplesOpenOffice.org 3.2 Basic examples @@ -469,8 +468,8 @@
-

The example programs are embedded in [PRODUCTNAME] documents in the - samples directory. To view or edit the [PRODUCTNAME] Basic source, +

The example programs are embedded in OpenOffice.org 3.2 documents in the + samples directory. To view or edit the OpenOffice.org 3.2 Basic source, select the appropriate document and then select Tools->Macro.

Most of the examples are stand-alone, but two of them (Creating an Index and Import/Export of ASCII Files) have an associated data file @@ -492,7 +491,7 @@

Description
Changing AppearanceChanging Appearance To change the style used for certain words, you can start with the following example. This code searches for the regular expression the[a-z], which stands for the text portion the @@ -503,7 +502,7 @@ must execute it from an open text document.
Replacing TextReplacing Text If you regularly receive documents from other people for editing, you might want to make sure that certain words are always written the same. The next example illustrates this by forcing certain @@ -513,7 +512,7 @@ words from an external file.
Using Regular ExpressionsUsing Regular Expressions Another application of automatic text modification is related to stylistic questions. Suppose your company’s policy is to avoid the use of certain words. You want to replace these words, but you @@ -530,7 +529,7 @@ (plural, adjective etc.).
Inserting BookmarksInserting Bookmarks

The next example does something very similar. This time, however, we do not change the color of the words but insert a bookmark at each of @@ -545,14 +544,14 @@ word.
Creating an IndexCreating an Index Indices for text documents can be created manually in - [PRODUCTNAME] Writer by clicking on the words that should appear in the + OpenOffice.org 3.2 Writer by clicking on the words that should appear in the index. If the document is large, or if you have to generate indices for several documents, this task should be automated.
Adapting to EurolandAdapting to Euroland Most of the members of the European Union will abandon their old currency in favor of the new Euro in 2001. This requires modifications to all programs using the old currencies. Since the exchange @@ -561,14 +560,14 @@ in a table that are formatted with the currency string DM.
Import/Export of ASCII FilesImport/Export of ASCII Files You can use the drawing facilities of StarOffice API to generate a picture from ASCII input. One application would be a hierarchical representation of a directory listing, based on textual data.
Stock Quotes UpdaterStock Quotes Updater If you want to display stock charts for certain companies, you can open up your browser every day, go to a search engine, look up the quote and copy it by hand into a table. Or you can use a @@ -580,7 +579,7 @@ UpdateValue(), and UpdateChart().
Forms and ControlsForms and Controls The example document Burger Factory offers some forms and controls, which you can use to order your desired burger type, beverage, topping, and sauce. By hitting the button @@ -595,7 +594,7 @@
- Additional information: [PRODUCTNAME] Basic language binding + Additional information: OpenOffice.org 3.2 Basic language binding
@@ -606,7 +605,7 @@
-

Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.

+
+

+ Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

+

diff --git a/odk/index.html b/odk/index.html index ace6cbeb65a0..f926fdc0d7b5 100644 --- a/odk/index.html +++ b/odk/index.html @@ -1,18 +1,16 @@ - [TITLE] - SDK + OpenOffice.org 3.2 SDK - SDK - - - - + + @@ -23,12 +21,12 @@ - @@ -93,7 +91,7 @@ - + @@ -134,7 +132,7 @@ Office Applications (OpenDocument) Technical Committee where you can find the latest information about the OASIS Open Document XML file format which is the default document format - for [PRODUCTNAME]. + for OpenOffice.org 3.2. @@ -149,7 +147,7 @@ - + @@ -164,28 +162,17 @@ - - - - + + + + - - - - - - - - - - - - + +
-

[PRODUCTNAME] software is a complete, feature-rich +

OpenOffice.org 3.2 software is a complete, feature-rich office productivity suite that provides, in combination with this SDK, all the essential tools for building and deploying custom - solutions that build on, or integrate with, the [PRODUCTNAME] suite + solutions that build on, or integrate with, the OpenOffice.org 3.2 suite of products.

-

The SDK is a development kit for [PRODUCTNAME], which +

The SDK is a development kit for OpenOffice.org 3.2, which eases the development of office components. It provides a set of libraries, binaries, header, and IDL files which have final API's and can only be extended with new functionality. This set of libraries @@ -43,8 +41,8 @@ with new functions.

The SDK provides the basic building blocks for external developers to develop components in any language for which a binding exists. - Currently, there are language bindings for [PRODUCTNAME] Basic, Java, - and different C++ compilers on different platforms, for [PRODUCTNAME], + Currently, there are language bindings for OpenOffice.org 3.2 Basic, Java, + and different C++ compilers on different platforms, for OpenOffice.org 3.2, thus covering the two most commonly used programming languages. There will be no limit for office automation in heterogeneous environments. Currently supported platforms of the SDK are Linux, Solaris (sparc, @@ -85,7 +83,7 @@

Developer's GuideDetailed documentation, explaining the [PRODUCTNAME] + Detailed documentation, explaining the OpenOffice.org 3.2 API and the concepts behind it, with a rich set of examples, implemented mainly in Java. This documentation is online in the OpenOffice.org Wiki.
IDL ReferenceComplete [PRODUCTNAME] API reference.Complete OpenOffice.org 3.2 API reference.
LicenseThe license for the [PRODUCTNAME] SDK.The license for the OpenOffice.org 3.2 SDK.
Oracle Developer NetworkA Community for Developers
+ Oracle Open Office™Full-featured suite of office productivity tools.
- StarOffice™Full-featured suite of office productivity - tools.
+ OpenOffice.orgOpen Source community project of - office-productivity software.OpenOffice.org™Open Source community project of office-productivity software.
-

Copyright © 1995, 2010, Oracle and/or its affiliates. All rights reserved.

+
+

+ Copyright © 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

+

From 918bdca9fd09175496443e3ce17c49afeac1967c Mon Sep 17 00:00:00 2001 From: Juergen Schmidt Date: Wed, 31 Mar 2010 07:44:50 +0200 Subject: [PATCH 4/5] nativea: SDK rebanding, change css for generated docu --- odk/docs/common/ref/idl.css | 21 ++++++++++---------- odk/docs/cpp/ref/cpp.css | 36 +++++++++++++++++----------------- odk/docs/images/bg_table2.png | Bin 0 -> 128 bytes odk/docs/images/bg_table3.png | Bin 0 -> 128 bytes odk/pack/copying/makefile.mk | 14 ++++++------- odk/util/check.pl | 16 +++++++-------- 6 files changed, 43 insertions(+), 44 deletions(-) mode change 100755 => 100644 odk/docs/cpp/ref/cpp.css create mode 100644 odk/docs/images/bg_table2.png create mode 100644 odk/docs/images/bg_table3.png diff --git a/odk/docs/common/ref/idl.css b/odk/docs/common/ref/idl.css index 3fdb1a07a00c..6327b9243f80 100644 --- a/odk/docs/common/ref/idl.css +++ b/odk/docs/common/ref/idl.css @@ -6,9 +6,9 @@ body { background-color:#ffffff; } #adc-idlref a { text-decoration: none; } -#adc-idlref a:link { color: #C44B01; } +#adc-idlref a:link { color: #0e85cd; } #adc-idlref a:visited { color: #638093; } -#adc-idlref a:active { color: #9DCA12; } +#adc-idlref a:active { color: #4dadea; } #adc-idlref h3 { font-size:13pt; font-weight:bold; @@ -26,13 +26,13 @@ body { background-color:#ffffff; } #adc-idlref td.title { font-family: Arial; font-size:19pt; font-weight:bold; line-height:30pt; - background-image:url(../../images/bg_table.gif); + background-image:url(../../images/bg_table.png); text-align:center; } #adc-idlref td.subtitle { font-family: Arial; font-size:13pt; line-height:20pt; - background-image:url(../../images/bg_table.gif); } + background-image:url(../../images/bg_table.png); } #adc-idlref td.crosstitle { font-size:12pt; font-weight:bold; @@ -40,15 +40,15 @@ body { background-color:#ffffff; } #adc-idlref td.imdetail { width:100%; - background-image:url(../../images/bg_table3.gif); } + background-image:url(../../images/bg_table3.png); } #adc-idlref td.imsum_left { width:30%; } #adc-idlref td.imsum_right { width:70%; } -#adc-idlref table.navimain { background-image:url(../../images/bg_table2.gif); } +#adc-idlref table.navimain { background-image:url(../../images/bg_table2.png); } #adc-idlref td.navimain - { background-image:url(../../images/bg_table2.gif); + { background-image:url(../../images/bg_table2.png); text-align:center; font-family: Arial; font-size:12pt; font-weight:bold; padding-left:7pt; padding-right:7pt; } @@ -79,13 +79,12 @@ body { background-color:#ffffff; } #adc-idlref a.membertitle { font-size:12pt; font-weight:bold; line-height:18pt; } -#adc-idlref a:link.navimain, #adc-idlref a:link.navisub { color:#C44B01; } +#adc-idlref a:link.navimain, #adc-idlref a:link.navisub { color:#0e85cd; } #adc-idlref a:visited.navimain, #adc-idlref a:visited.navisub { color: #638093; } -#adc-idlref a:active.navimain, #adc-idlref a:active.navisub { color: #9DCA12; } +#adc-idlref a:active.navimain, #adc-idlref a:active.navisub { color: #4dadea; } #adc-idlref .dt { font-weight:bold; } -#adc-idlref .namechain { font-size:13pt; font-weight:bold; - margin-top:3pt; margin-bottom:6pt; } +#adc-idlref .namechain { font-size:13pt; font-weight:bold; margin-top:3pt; margin-bottom:6pt; } #adc-idlref .title2 { font-size:13pt; font-style:italic; font-weight:bold; text-align:left; } #adc-idlref table { empty-cells:show; } diff --git a/odk/docs/cpp/ref/cpp.css b/odk/docs/cpp/ref/cpp.css old mode 100755 new mode 100644 index d657b2b17244..b8286999bf19 --- a/odk/docs/cpp/ref/cpp.css +++ b/odk/docs/cpp/ref/cpp.css @@ -4,9 +4,9 @@ body { background-color:#ffffff; } #adc-cppref a { text-decoration: none; } -#adc-cppref a:link { color: #C44B01; } +#adc-cppref a:link { color: #0e85cd; } #adc-cppref a:visited { color: #638093; } -#adc-cppref a:active { color: #9DCA12; } +#adc-cppref a:active { color: #4dadea; } #adc-cppref h1 { font-size:20pt; margin-top:3pt; margin-bottom:7pt; } #adc-cppref h2 { font-family:Arial; font-size:16pt; margin-top:3pt; margin-bottom:5pt; } @@ -14,7 +14,7 @@ body { background-color:#ffffff; } #adc-cppref h4 { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } #adc-cppref dl { margin-top:1pt; margin-bottom:1pt; } #adc-cppref dl.member { margin-top:1pt; margin-bottom:1pt; - background-image:url(../../images/bg_table3.gif); } + background-image:url(../../images/bg_table3.png); } #adc-cppref dt { font-size:10pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } #adc-cppref dt.member { font-size:13pt; font-weight:bold; margin-top:2pt; margin-bottom:1pt; } #adc-cppref dt.simple { font-size:10pt; font-weight:normal; margin-top:2pt; margin-bottom:1pt; } @@ -25,43 +25,43 @@ body { background-color:#ffffff; } #adc-cppref tr { font-size:10pt; } #adc-cppref td { font-size:10pt; } -#adc-cppref dt.attention { color:#dd0000; } +#adc-cppref dt.attention { color:#ff0000; } #adc-cppref div.title { text-align:center; line-height:26pt; - background-image:url(../../images/bg_table.gif); } -#adc-cppref .subtitle { background-image:url(../../images/bg_table.gif); } + background-image:url(../../images/bg_table.png); } +#adc-cppref .subtitle { background-image:url(../../images/bg_table.png); } -#adc-cppref td.flagname { background-image:url(../../images/bg_table2.gif); +#adc-cppref td.flagname { background-image:url(../../images/bg_table2.png); font-family:Arial; font-size:8pt; font-weight:bold; } #adc-cppref td.flagyes { font-family:Arial; font-size:8pt; font-weight:bold; } #adc-cppref td.flagno { font-family:Arial; font-size:8pt; } #adc-cppref td.flagtext { font-family:Arial; font-size:8pt; font-weight:bold; } #adc-cppref td.navimain, td.navimain a - { background-image:url(../../images/bg_table2.gif); + { background-image:url(../../images/bg_table2.png); font-family:Arial; font-size:12pt; font-weight:bold; } /* background-color:#eeeeff; color:#000000; */ #adc-cppref td.navimainself - { background-color:#2222ad; color:#ffffff; + { background-color:#226bb0; color:#ffffff; font-family:Arial; font-size:12pt; font-weight:bold; } #adc-cppref td.navimainnone - { background-image:url(../../images/bg_table2.gif); + { background-image:url(../../images/bg_table2.png); font-family:Arial; font-size:12pt; } -#adc-cppref div.define { font-family:Arial; background-color:#ccccff; } +#adc-cppref div.define { font-family:Arial; background-color:#87c2e6; } #adc-cppref .nqclass { color:#008800; } -#adc-cppref h3.help { background-color:#eeeeff; margin-top:12pt; } +#adc-cppref h3.help { background-color:#cfe7f5; margin-top:12pt; } -#adc-cppref .btpubl { color:#33ff33; } -#adc-cppref .btprot { color:#cc9933; } -#adc-cppref .btpriv { color:#ff6666; } -#adc-cppref .btvpubl { color:#33ff33; font-style:italic; } -#adc-cppref .btvprot { color:#cc9933; font-style:italic; } -#adc-cppref .btvpriv { color:#ff6666; font-style:italic; } +#adc-cppref .btpubl { color:#87c2e6; } +#adc-cppref .btprot { color:#226bb0; } +#adc-cppref .btpriv { color:#06348c; } +#adc-cppref .btvpubl { color:#87c2e6; font-style:italic; } +#adc-cppref .btvprot { color:#226bb0; font-style:italic; } +#adc-cppref .btvpriv { color:#06348c; font-style:italic; } #adc-cppref .btself { font-weight:bold; } #adc-cppref table { empty-cells:show; } diff --git a/odk/docs/images/bg_table2.png b/odk/docs/images/bg_table2.png new file mode 100644 index 0000000000000000000000000000000000000000..d0cafddfecaa685c780a0b37872a8ff0d4fcfa40 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrA!2~3KZCES|5-1LGcVbv~PUa<$!&%@FS1=Fl6kuZr(PnZA TT|OfMD9hmK>gTe~DWM4fGSVDo literal 0 HcmV?d00001 diff --git a/odk/docs/images/bg_table3.png b/odk/docs/images/bg_table3.png new file mode 100644 index 0000000000000000000000000000000000000000..2759066df9283c5a14b24a53fa1bc00637ae7e4a GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^j6lrA!2~3KZCES|5-1LGcVbv~PUa<$!&%@FS Date: Wed, 31 Mar 2010 08:40:38 +0200 Subject: [PATCH 5/5] nativea: SDK rebanding, adapt check --- odk/pack/copying/makefile.mk | 2 +- odk/util/check.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk index f934720006ce..b8a7b9a6cd48 100644 --- a/odk/pack/copying/makefile.mk +++ b/odk/pack/copying/makefile.mk @@ -138,7 +138,7 @@ DOCUFILES= \ $(DESTDIRDOCUIMAGES)/bluball.gif \ $(DESTDIRDOCUIMAGES)/orc-main-app_32.png \ $(DESTDIRDOCUIMAGES)/ooo-main-app_32.png \ - $(DESTDIRDOCUIMAGES)/odk-footer-logo.png \ + $(DESTDIRDOCUIMAGES)/odk-footer-logo.gif \ $(DESTDIRDOCUIMAGES)/arrow-1.gif \ $(DESTDIRDOCUIMAGES)/arrow-3.gif \ $(DESTDIRDOCUIMAGES)/bg_table.png \ diff --git a/odk/util/check.pl b/odk/util/check.pl index d6fa9c3b27a0..0ba7f05a6ed2 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -84,7 +84,7 @@ if (-d "$StartDir") { my @filelist = ( "install.html", "notsupported.html","sdk_styles.css","tools.html", "images/arrow-1.gif", "images/arrow-3.gif", - "odk-footer-logo.png", + "images/odk-footer-logo.gif", "images/bg_table.png","images/bg_table2.png", "images/bg_table3.png", "images/nav_down.png", "images/nav_home.png","images/nav_left.png",