You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/02/20 19:06:53 UTC
svn commit: r1291394 [11/17] - in /incubator/ooo/branches/alg/install: ./
ext_sources/ extras/l10n/ extras/l10n/source/ extras/l10n/util/ main/
main/accessibility/bridge/org/openoffice/accessibility/
main/accessibility/bridge/org/openoffice/java/access...
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPageContainerQueue.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPageDescriptor.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPageDescriptor.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPagesPanel.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/PreviewValueSet.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/SlideTransitionPanel.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/TableDesignPanel.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/controls/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/toolpanel/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/AsynchronousCall.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/ConfigurationAccess.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/EventMultiplexer.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/IconCache.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/IdleDetection.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/PropertySet.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/SdGlobalResourceContainer.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/SlotStateListener.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/TimerBasedTaskExecution.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/tools/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/DrawController.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/SdUnoDrawView.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/SdUnoOutlineView.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/SdUnoSlideView.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/UnoDocumentSettings.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/UnoDocumentSettings.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/detreg.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/facreg.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/randomnode.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/sddetect.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/sddetect.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unocpres.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unocpres.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unodoc.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unohelp.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unokywds.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unolayer.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unolayer.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unomodel.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unomodule.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unomodule.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unoobj.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unoobj.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unopage.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unopage.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unopback.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unopback.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unopool.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unosrch.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unowcntr.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/unoidl/unowcntr.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/DocumentRenderer.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/DocumentRenderer.hrc
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/DocumentRenderer.src
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/FormShellManager.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/GraphicObjectBar.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/GraphicViewShellBase.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/ImpressViewShellBase.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/MediaObjectBar.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/OutlineViewShellBase.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/Outliner.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/OutlinerIterator.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/PresentationViewShellBase.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/SlideSorterViewShellBase.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/ToolBarManager.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/UpdateLockManager.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/ViewClipboard.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/ViewShellHint.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/ViewShellImplementation.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/ViewShellManager.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/ViewTabBar.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/WindowUpdater.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/bmcache.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/clview.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drawview.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drbezob.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drtxtob.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drtxtob1.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews1.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews2.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews3.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews4.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews5.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews6.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews7.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews8.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviews9.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsa.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsb.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsc.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsd.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewse.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsf.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsg.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsh.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsi.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drviewsj.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/drvwshrg.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/frmview.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/grviewsh.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/outlnvs2.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/outlnvsh.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/outlview.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/presvish.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/sdruler.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/sdview.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/sdview2.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/sdview3.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/sdview4.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/sdview5.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/sdwindow.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/tabcontr.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/unmodpg.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/viewoverlaymanager.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/viewshe2.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/viewshel.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/ui/view/zoomlist.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/source/unotypes/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/menubar/menubar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/statusbar/statusbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/3dobjectsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/alignmentbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/arrowsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/arrowshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/basicshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/bezierobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/calloutshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/choosemodebar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/colorbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/commentsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/connectorsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/drawingobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/ellipsesbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/extrusionobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/flowchartshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/fontworkobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/fontworkshapetype.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/formcontrols.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/formdesign.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/formsfilterbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/formsnavigationbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/formtextobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/fullscreenbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/gluepointsobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/graffilterbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/graphicobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/insertbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/linesbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/masterviewtoolbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/mediaobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/optimizetablebar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/optionsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/positionbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/rectanglesbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/standardbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/starshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/symbolshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/tableobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/textbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/textobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/toolbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/viewerbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/sdraw/toolbar/zoombar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/menubar/menubar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/statusbar/statusbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/3dobjectsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/alignmentbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/arrowsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/arrowshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/basicshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/bezierobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/calloutshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/choosemodebar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/colorbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/commentsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/commontaskbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/connectorsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/drawingobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/ellipsesbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/extrusionobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/flowchartshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/fontworkobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/fontworkshapetype.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/formcontrols.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/formdesign.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/formsfilterbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/formsnavigationbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/formtextobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/fullscreenbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/gluepointsobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/graffilterbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/graphicobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/insertbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/linesbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/masterviewtoolbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/mediaobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/optimizetablebar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/optionsbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/outlinetoolbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/positionbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/rectanglesbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/slideviewobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/slideviewtoolbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/standardbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/starshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/symbolshapes.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/tableobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/textbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/textobjectbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/toolbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/viewerbar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/uiconfig/simpress/toolbar/zoombar.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/util/exports.dxp
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/util/hidother.hrc
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/util/hidother.src
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/util/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/util/makefile.pmk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/util/sdfilt.map
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/util/sdui.map
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/workben/testdll/makefile
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessibleDrawDocumentView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessibleOutlineView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessiblePageShape.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessiblePresentationGraphicShape.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessiblePresentationOLEShape.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessiblePresentationShape.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessibleSlideView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/AccessibleSlideViewObject.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/DrawingView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/HandoutView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/NotesView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/OutlineView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/PresentationView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdDocLinkTargets.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdDrawPage.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdDrawPagesAccess.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdGenericDrawPage.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdLayer.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdLayerManager.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdMasterPage.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdMasterPagesAccess.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdPageLinkTargets.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdXCustomPresentation.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdXCustomPresentationAccess.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdXImpressDocument.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdXPresentation.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SdXShape.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/SlidesView.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/effects.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/transitions-ogl.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xml/transitions.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sd/xsl/effect.xsl
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/minimizer/description.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/minimizer/help/component.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/dialogs/xpdfimport_err.pdf
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/help/component.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/inc/contentsink.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/inc/pdfihelper.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/inc/wrapper.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/test/export.map
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/test/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/test/testinput.odp
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/test/testinput.pdf
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/test/tests.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/wrapper/hash.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/wrapper/keyword_list
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/wrapper/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/pdfimport/wrapper/wrapper.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/presenter/PresenterAccessibility.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/presenter/PresenterAccessibility.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/presenter/PresenterScreen.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/presenter/PresenterTextView.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/presenter/PresenterTextView.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sdext/source/presenter/help/component.txt
('svn:executable' removed)
Modified: incubator/ooo/branches/alg/install/main/set_soenv.in
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/set_soenv.in?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/set_soenv.in (original)
+++ incubator/ooo/branches/alg/install/main/set_soenv.in Mon Feb 20 18:03:22 2012
@@ -147,6 +147,9 @@ $GLIBC = ""; # Wh
$PROEXT = "@PROEXT@";
$EPM_FLAGS = "";
+# Required for OS/2 macro expansion
+my @unixroot='@unixroot';
+
#
#--------------------------------------------------------------------
# IV. Initialise the warning container and print a note to the user.
@@ -839,7 +842,14 @@ if ( $platform =~ m/cygwin|os2/ ) {
$JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any.
}
# 3. shell path.
+if ( $platform =~ m/os2/ )
+{
+$OOO_SHELL = 'sh';
+}
+else
+{
$OOO_SHELL = '@SHELLPATH@'."\/bash";
+}
if ( '@STLPORT4@' eq $no_stl )
{
@@ -1309,7 +1319,7 @@ elsif ($platform =~ m/os2/)
if ( '@ANT_HOME@' ne '' )
{
- $PATH .= $ps.'@ANT_HOME@';
+ $PATH .= $ps.'@ANT_HOME@/bin';
}
# Append old PATH
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/java/javaversion.dat
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/packinfo_office.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/packinfo_office_lang.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/packinfo_sdkoo.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/packinfo_ure.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/shellscripts.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/shellscripts_extensions.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/shellscripts_module.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/shellscripts_root.txt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/packinfo/solariscopyrightfile
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/patch/exports.dxp
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/patch/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/reg64/exports.dxp
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/reg64/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/reg64/reg64.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/shellextensions/checkdirectory.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/shellextensions/migrateinstallpath.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/shellextensions/postuninstall.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/customactions/shellextensions/setadmininstall.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/nsis/ooosetup.ico
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/setup_native/source/win32/nsis/urebitmap.bmp
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/CppunitTest_sfx2_metadatable.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/JunitTest_sfx2_complex.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/inc/sfx2/sfx.hrc
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/inc/sfx2/sfxcommands.h
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/DocumentEvents.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/JUnitBasedTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/UndoManager.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/CalcDocumentTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/ChartDocumentTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/DocumentTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/DocumentTestBase.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/DrawDocumentTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/DrawingOrPresentationDocumentTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/ImpressDocumentTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/qa/complex/sfx2/undo/WriterDocumentTest.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/control/dispatch.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/dialog/sfxdlg.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/doc/docundomanager.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/doc/oleprops.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/doc/oleprops.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/doc/printhelper.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/doc/printhelper.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/doc/sfxacldetect.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/doc/syspath.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/inc/docundomanager.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/menu/mnumgr.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/menu/thessubmenu.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/sfx2/source/view/viewprn.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/inc/internal/metainforeader.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/inc/internal/propertyhdl.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/inc/internal/propsheets.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/inc/internal/shlxthdl.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/inc/internal/stream_helper.hxx
('svn:executable' removed)
Modified: incubator/ooo/branches/alg/install/main/shell/inc/internal/utilities.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/shell/inc/internal/utilities.hxx?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/shell/inc/internal/utilities.hxx (original)
+++ incubator/ooo/branches/alg/install/main/shell/inc/internal/utilities.hxx Mon Feb 20 18:03:22 2012
@@ -100,10 +100,10 @@ typedef const char *LPCSTR;
#ifdef DEBUG
inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
{
+#ifndef OS2
CHAR buffer[1024];
va_list args;
-#ifndef OS2
va_start( args, pFormat );
StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
OutputDebugStringA( buffer );
Propchange: incubator/ooo/branches/alg/install/main/shell/inc/internal/utilities.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/prj/build.lst
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/all/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/cmdmail/cmdmailentry.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/cmdmail/cmdmailmsg.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/cmdmail/cmdmailsuppl.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/unix/sysshell/recfile.map
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/classfactory.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/infotips/infotips.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/ooofilt/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/prophdl/exports.dxp
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/prophdl/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/shlxthdl.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/util/fileextensions.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/shell/source/win32/shlxthandler/util/utilities.cxx
('svn:executable' removed)
Modified: incubator/ooo/branches/alg/install/main/slideshow/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/slideshow/util/makefile.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/slideshow/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/install/main/slideshow/util/makefile.mk Mon Feb 20 18:03:22 2012
@@ -47,7 +47,11 @@ LIB1FILES=\
$(SLB)$/slide.lib \
$(SLB)$/engine.lib
+.IF "$(GUI)" == "OS2"
+SHL1TARGET=slidesho
+.ELSE
SHL1TARGET=$(TARGET).uno
+.ENDIF
SHL1STDLIBS= $(TOOLSLIB) \
$(CPPULIB) \
@@ -73,7 +77,11 @@ DEF1EXPORTFILE=exports.dxp
# ==========================================================================
+.IF "$(GUI)" == "OS2"
+TARGET2=slshtest
+.ELSE
TARGET2=slideshowtest
+.ENDIF
LIB2TARGET=$(SLB)$/$(TARGET2).lib
LIB2FILES=$(LIB1FILES)
@@ -86,7 +94,11 @@ SHL2LIBS=$(SLB)$/$(TARGET2).lib
DEF2NAME =$(SHL2TARGET)
DEF2LIBNAME = $(TARGET2)
+.IF "$(GUI)" == "OS2"
+DEF2DEPN =$(MISC)$/slideshowtest.flt
+.ELSE
DEF2DEPN =$(MISC)$/$(SHL2TARGET).flt
+.ENDIF
DEF2DES =SlideShowTest
@@ -94,10 +106,16 @@ DEF2DES =SlideShowTest
.INCLUDE : target.mk
+.IF "$(GUI)" == "OS2"
+$(MISC)$/slideshowtest.flt: makefile.mk \
+ slideshowtest.flt
+ +$(TYPE) slideshowtest.flt > $@
+.ELSE
$(MISC)$/$(SHL2TARGET).flt: makefile.mk \
$(TARGET2).flt
+$(TYPE) $(TARGET2).flt > $@
+.ENDIF
ALLTAR : $(MISC)/slideshow.component
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.java
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/com/sun/star/comp/smoketest/delzip
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/com/sun/star/comp/smoketest/manifest.xml
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/prj/build.lst
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestdoc/prj/d.lst
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestoo_native/makefile.mk
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestoo_native/prj/build.lst
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestoo_native/prj/d.lst
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestoo_native/smoketest.cxx
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/smoketestoo_native/version.map
('svn:executable' removed)
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/build.pl
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/build.pl?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/build.pl (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/build.pl Mon Feb 20 18:03:22 2012
@@ -2979,8 +2979,8 @@ sub generate_html_file {
print HTML ' top.innerFrame.frames[1].document.write(" <td width=* align=center><strong style=color:blue>Job</strong></td>");' . "\n";
print HTML ' top.innerFrame.frames[1].document.write(" <td width=* align=center><strong style=color:blue>Start Time</strong></td>");' . "\n";
print HTML ' top.innerFrame.frames[1].document.write(" <td width=* align=center><strong style=color:blue>Finish Time</strong></td>");' . "\n";
- print HTML ' top.innerFrame.frames[1].document.write(" <td width=* align=center><strong style=color:blue>Client</strong></td>");' . "\n";
- print HTML ' top.innerFrame.frames[1].document.write(" <td width=* align=center><strong style=color:blue>Link</strong></td>");' . "\n" if ($server_mode);
+ print HTML ' top.innerFrame.frames[1].document.write(" <td width=* align=center><strong style=color:blue> </strong></td>");' . "\n";
+ print HTML ' top.innerFrame.frames[1].document.write(" <td width=* align=center><strong style=color:blue>Client</strong></td>");' . "\n" if ($server_mode);
print HTML ' top.innerFrame.frames[1].document.write(" </tr>");' . "\n";
print HTML ' var dir_info_strings = Message2.split("<br><br>");' . "\n";
print HTML ' for (i = 0; i < dir_info_strings.length; i++) {' . "\n";
@@ -2996,8 +2996,12 @@ sub generate_html_file {
print HTML ' };' . "\n";
print HTML ' top.innerFrame.frames[1].document.write(" <td align=center>" + dir_info_array[2] + "</td>");' . "\n";
print HTML ' top.innerFrame.frames[1].document.write(" <td align=center>" + dir_info_array[3] + "</td>");' . "\n";
- print HTML ' top.innerFrame.frames[1].document.write(" <td align=center>" + dir_info_array[5] + "</td>");' . "\n";
- print HTML ' top.innerFrame.frames[1].document.write(" <td align=center><a target=\"_blank\" href=\"" + dir_info_array[4] + "\">link</a></td>");' . "\n" if ($server_mode);
+ print HTML ' if (dir_info_array[4] == "@") {' . "\n";
+ print HTML ' top.innerFrame.frames[1].document.write(" <td align=center> </td>");' . "\n";
+ print HTML ' } else {' . "\n";
+ print HTML ' top.innerFrame.frames[1].document.write(" <td align=center><a target=\"_blank\" href=\"" + dir_info_array[4] + "\">link</a></td>");' . "\n";
+ print HTML ' };' . "\n";
+ print HTML ' top.innerFrame.frames[1].document.write(" <td align=center>" + dir_info_array[5] + "</td>");' . "\n" if ($server_mode);
print HTML ' top.innerFrame.frames[1].document.write(" </tr>");' . "\n";
print HTML ' };' . "\n";
print HTML ' top.innerFrame.frames[1].document.write("</table>");' . "\n";
Propchange: incubator/ooo/branches/alg/install/main/solenv/bin/installoffice_impress.oxt
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/solenv/bin/modules/Cws.pm
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/solenv/bin/modules/Eis.pm
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/solenv/bin/modules/SourceConfig.pm
('svn:executable' removed)
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/control.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/control.pm?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/control.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/control.pm Mon Feb 20 18:03:22 2012
@@ -87,6 +87,11 @@ sub check_system_path
# has to be converted to DOS style for further use.
$local_pathseparator = ';';
}
+ if( $^O =~ /os2/i )
+ {
+ # has to be converted to DOS style for further use.
+ $local_pathseparator = ';';
+ }
my $patharrayref = installer::converter::convert_stringlist_into_array(\$pathvariable, $local_pathseparator);
$installer::globals::patharray = $patharrayref;
@@ -110,7 +115,7 @@ sub check_system_path
}
}
- elsif ($installer::globals::iswin)
+ elsif ($installer::globals::iswin || $installer::globals::isos2)
{
@needed_files_in_path = ("zip.exe");
}
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/epmfile.pm Mon Feb 20 18:03:22 2012
@@ -385,7 +385,7 @@ sub create_epm_header
# License and Readme file can be included automatically from the file list
- if ( $installer::globals::iswindowsbuild )
+ if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
{
$licensefilename = "license.txt";
$readmefilename = "readme.txt";
@@ -399,7 +399,7 @@ sub create_epm_header
if (( $installer::globals::languagepack ) # in language packs the files LICENSE and README are removed, because they are not language specific
|| ( $variableshashref->{'NO_README_IN_ROOTDIR'} ))
{
- if ( $installer::globals::iswindowsbuild )
+ if ( $installer::globals::iswindowsbuild || $installer::globals::isos2 )
{
$licensefilename = "license_$searchlanguage.txt";
$readmefilename = "readme_$searchlanguage.txt";
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/globals.pm Mon Feb 20 18:03:22 2012
@@ -125,6 +125,7 @@ BEGIN
$islinux = 0;
$issolaris = 0;
$ismacosx = 0;
+ $isos2 = 0;
$iswindowsbuild = 0;
$islinuxbuild = 0;
$islinuxrpmbuild = 0;
@@ -513,6 +514,20 @@ BEGIN
%savedrev83mapping = ();
%saved83dirmapping = ();
}
+ elsif ( $plat =~ /os2/i )
+ {
+ print "Setup OS/2 platform\n";
+ $zippath = "zip"; # Has to be in the path: /usr/bin/zip
+ $checksumfile = "so_checksum";
+ $unopkgfile = "unopkg.exe";
+ $separator = "/";
+ $pathseparator = "\:";
+ $libextension = "\.dll";
+ $isunix = 0;
+ $iswin = 0;
+ $isos2 = 1;
+ $archiveformat = ".zip";
+ }
else
{
$zippath = "zip"; # Has to be in the path: /usr/bin/zip
@@ -540,6 +555,7 @@ BEGIN
if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
if ( $plat =~ /solaris/i ) { $issolaris = 1; }
if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
+ if ( $plat =~ /os2/i ) { $isos2 = 1; }
# ToDo: Needs to be expanded for additional platforms
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/parameter.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/parameter.pm?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/parameter.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/parameter.pm Mon Feb 20 18:03:22 2012
@@ -219,7 +219,7 @@ sub make_path_absolute
}
}
- if ( $installer::globals::iswin )
+ if ( $installer::globals::iswin || $installer::globals::isos2 )
{
if ( $^O =~ /cygwin/i )
{
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/pathanalyzer.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/pathanalyzer.pm?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/pathanalyzer.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/pathanalyzer.pm Mon Feb 20 18:03:22 2012
@@ -58,7 +58,7 @@ sub make_absolute_filename_to_relative_f
}
}
- if ( $installer::globals::iswin )
+ if ( $installer::globals::iswin || $installer::globals::isos2 )
{
# Either '/' or '\'. It would be possible to use $installer::globals::separator.
if ( $$longfilenameref =~ /^.*[\/\\](\S.+\S?)/ )
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/simplepackage.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/simplepackage.pm?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/simplepackage.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/simplepackage.pm Mon Feb 20 18:03:22 2012
@@ -371,7 +371,15 @@ sub create_package
$from = cwd();
$return_to_start = 1;
chdir($tempdir);
- $systemcall = "$installer::globals::zippath -qr $archive .";
+ if ( $^O =~ /os2/i )
+ {
+ my $zip = Cwd::realpath($archive);
+ $systemcall = "$installer::globals::zippath -qr $zip .";
+ }
+ else
+ {
+ $systemcall = "$installer::globals::zippath -qr $archive .";
+ }
# Using Archive::Zip fails because of very long path names below "share/uno_packages/cache"
# my $packzip = Archive::Zip->new();
@@ -655,7 +663,7 @@ sub create_simple_package
if ( ! -d $destdir )
{
- if ( $^O =~ /cygwin/i ) # Cygwin performance check
+ if ( $^O =~ /cygwin/i || $^O =~ /os2/i ) # Cygwin performance check
{
$infoline = "Try to create directory $destdir\n";
push(@installer::globals::logfileinfo, $infoline);
@@ -671,7 +679,7 @@ sub create_simple_package
}
# stripping files ?!
- if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild )) { installer::strip::strip_libraries($filesref, $languagestringref); }
+ if (( $installer::globals::strip ) && ( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::isos2 )) { installer::strip::strip_libraries($filesref, $languagestringref); }
# copy Files
installer::logger::print_message( "... copying files ...\n" );
@@ -694,7 +702,7 @@ sub create_simple_package
$source =~ s/\$\$/\$/;
$destination =~ s/\$\$/\$/;
- if ( $^O =~ /cygwin/i ) # Cygwin performance, do not use copy_one_file. "chmod -R" at the end
+ if ( $^O =~ /cygwin/i || $^O =~ /os2/i ) # Cygwin performance, do not use copy_one_file. "chmod -R" at the end
{
my $copyreturn = copy($source, $destination);
Propchange: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/simplepackage.pm
('svn:executable' removed)
Modified: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/systemactions.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/systemactions.pm?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/systemactions.pm (original)
+++ incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/systemactions.pm Mon Feb 20 18:03:22 2012
@@ -426,6 +426,12 @@ sub copy_one_file
my ($returnvalue, $infoline);
+
+ # copy returns 0 if files are identical :-(
+ if ( $installer::globals::isos2 ) {
+ unlink($dest);
+ }
+
my $copyreturn = copy($source, $dest);
if ($copyreturn)
Propchange: incubator/ooo/branches/alg/install/main/solenv/bin/modules/installer/windows/mergemodule.pm
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/solenv/bin/modules/osarch.pm
('svn:executable' removed)
Propchange: incubator/ooo/branches/alg/install/main/solenv/gbuild/TargetLocations.mk
('svn:executable' removed)
Modified: incubator/ooo/branches/alg/install/main/solenv/gbuild/gbuild.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/gbuild/gbuild.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/gbuild/gbuild.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/gbuild/gbuild.mk Mon Feb 20 18:03:22 2012
@@ -44,7 +44,11 @@
# SYSTEM_LIBXML (Linux)
# USE_SYSTEM_STL (Linux)
+ifeq ($(OS),OS2)
+SHELL := /@unixroot/usr/bin/sh
+else
SHELL := /bin/sh
+endif
true := T
false :=
define NEWLINE
Modified: incubator/ooo/branches/alg/install/main/solenv/gbuild/platform/os2.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/gbuild/platform/os2.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/gbuild/platform/os2.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/gbuild/platform/os2.mk Mon Feb 20 18:03:22 2012
@@ -109,7 +109,9 @@ gb_CXXFLAGS := \
#
gb_STDLIBS = \
- stdc444 \
+ icule \
+ z \
+ stdc++ \
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
gb_CFLAGS_WERROR := -Werror
@@ -307,15 +309,6 @@ DLLBASE8 = $(call substr,$(notdir $(DLLT
DLLTARGET8 = $(dir $(DLLTARGET))$(DLLBASE8)$(gb_Library_DLLEXT)
DLLDEF8 = $(dir $(DLLTARGET))$(DLLBASE8).def
- #EMXEXPRSP=$(call var2filecr,$(shell $(gb_MKTEMP)),1, \
- $(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
- $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
- $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object)))) \
- ) && \
- emxexp @$${EMXEXPRSP} >> $(DLLDEF8) && \
- echo EXPORTS >> $(DLLDEF8) && \
-
-
define gb_LinkTarget__command_dynamiclinkexecutable
$(call gb_Output_announce,$(2),$(true),LNK,4)
$(call gb_Helper_abbreviate_dirs_native,\
@@ -373,11 +366,12 @@ gb_Library_DEFS := -D_DLL
gb_Library_TARGETTYPEFLAGS := -Zdll
gb_Library_get_rpath :=
-gb_Library_SYSPRE := i
+gb_Library_SYSPRE :=
gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
$(gb_STDLIBS) \
+ icule \
ft2lib \
dl \
freetype \
@@ -406,7 +400,7 @@ gb_Library_DLLEXT := .dll
gb_Library_MAJORVER :=
gb_Library_RTEXT := $(gb_Library_DLLEXT)
ifeq ($(gb_PRODUCT),$(true))
-gb_Library_STLEXT := stlp45$(gb_Library_DLLEXT)
+gb_Library_STLEXT := stdc++$(gb_Library_DLLEXT)
else
gb_Library_STLEXT := stlp45_stldebug$(gb_Library_DLLEXT)
endif
Modified: incubator/ooo/branches/alg/install/main/solenv/inc/_tg_app.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/install/main/solenv/inc/_tg_app.mk?rev=1291394&r1=1291393&r2=1291394&view=diff
==============================================================================
--- incubator/ooo/branches/alg/install/main/solenv/inc/_tg_app.mk (original)
+++ incubator/ooo/branches/alg/install/main/solenv/inc/_tg_app.mk Mon Feb 20 18:03:22 2012
@@ -219,11 +219,11 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP1LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP1LINKRES:b).rc > $(NULLDEV)
.IF "$(APP1ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP1ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP1LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP1ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP1LINKRES:b).rc
.ENDIF # "$(APP1ICON)" != ""
.IF "$(APP1VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
@@ -236,22 +236,6 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
@echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP1LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP1BASEX) \
- $(APP1STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP1LINKRES) \
- $(APP1RES) \
- $(APP1DEF) \
- $(APP1OBJS) \
- $(APP1LIBS) \
- $(APP1STDLIBS:^"-l") \
- $(APP1STDLIB:^"-l") $(STDLIB1:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP1LINKER) -v \
$(APP1LINKFLAGS) \
$(LINKFLAGSAPP) $(APP1BASEX) \
@@ -265,8 +249,8 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS)
$(APP1DEF) \
$(APP1OBJS) \
$(APP1LIBS) \
- $(APP1STDLIBS:^"-l") \
- $(APP1STDLIB:^"-l") $(STDLIB1:^"-l")
+ $(APP1STDLIBS) \
+ $(APP1STDLIB) $(STDLIB1)
.IF "$(APP1TARGET)" == "loader"
@@ -503,11 +487,11 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP2LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP2LINKRES:b).rc > $(NULLDEV)
.IF "$(APP2ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP2ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP2LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP2ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP2LINKRES:b).rc
.ENDIF # "$(APP2ICON)" != ""
.IF "$(APP2VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
@@ -520,22 +504,6 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
@echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP2LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP2BASEX) \
- $(APP2STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP2LINKRES) \
- $(APP2RES) \
- $(APP2DEF) \
- $(APP2OBJS) \
- $(APP2LIBS) \
- $(APP2STDLIBS:^"-l") \
- $(APP2STDLIB:^"-l") $(STDLIB2:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP2LINKER) -v \
$(APP2LINKFLAGS) \
$(LINKFLAGSAPP) $(APP2BASEX) \
@@ -549,8 +517,8 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS)
$(APP2DEF) \
$(APP2OBJS) \
$(APP2LIBS) \
- $(APP2STDLIBS:^"-l") \
- $(APP2STDLIB:^"-l") $(STDLIB2:^"-l")
+ $(APP2STDLIBS) \
+ $(APP2STDLIB) $(STDLIB2)
.IF "$(APP2TARGET)" == "loader"
@@ -787,11 +755,11 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP3LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP3LINKRES:b).rc > $(NULLDEV)
.IF "$(APP3ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP3ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP3LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP3ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP3LINKRES:b).rc
.ENDIF # "$(APP3ICON)" != ""
.IF "$(APP3VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
@@ -804,22 +772,6 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
@echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP3LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP3BASEX) \
- $(APP3STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP3LINKRES) \
- $(APP3RES) \
- $(APP3DEF) \
- $(APP3OBJS) \
- $(APP3LIBS) \
- $(APP3STDLIBS:^"-l") \
- $(APP3STDLIB:^"-l") $(STDLIB3:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP3LINKER) -v \
$(APP3LINKFLAGS) \
$(LINKFLAGSAPP) $(APP3BASEX) \
@@ -833,8 +785,8 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS)
$(APP3DEF) \
$(APP3OBJS) \
$(APP3LIBS) \
- $(APP3STDLIBS:^"-l") \
- $(APP3STDLIB:^"-l") $(STDLIB3:^"-l")
+ $(APP3STDLIBS) \
+ $(APP3STDLIB) $(STDLIB3)
.IF "$(APP3TARGET)" == "loader"
@@ -1071,11 +1023,11 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP4LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP4LINKRES:b).rc > $(NULLDEV)
.IF "$(APP4ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP4ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP4LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP4ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP4LINKRES:b).rc
.ENDIF # "$(APP4ICON)" != ""
.IF "$(APP4VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
@@ -1088,22 +1040,6 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
@echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP4LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP4BASEX) \
- $(APP4STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP4LINKRES) \
- $(APP4RES) \
- $(APP4DEF) \
- $(APP4OBJS) \
- $(APP4LIBS) \
- $(APP4STDLIBS:^"-l") \
- $(APP4STDLIB:^"-l") $(STDLIB4:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP4LINKER) -v \
$(APP4LINKFLAGS) \
$(LINKFLAGSAPP) $(APP4BASEX) \
@@ -1117,8 +1053,8 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS)
$(APP4DEF) \
$(APP4OBJS) \
$(APP4LIBS) \
- $(APP4STDLIBS:^"-l") \
- $(APP4STDLIB:^"-l") $(STDLIB4:^"-l")
+ $(APP4STDLIBS) \
+ $(APP4STDLIB) $(STDLIB4)
.IF "$(APP4TARGET)" == "loader"
@@ -1355,11 +1291,11 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP5LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP5LINKRES:b).rc > $(NULLDEV)
.IF "$(APP5ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP5ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP5LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP5ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP5LINKRES:b).rc
.ENDIF # "$(APP5ICON)" != ""
.IF "$(APP5VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
@@ -1372,22 +1308,6 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
@echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP5LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP5BASEX) \
- $(APP5STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP5LINKRES) \
- $(APP5RES) \
- $(APP5DEF) \
- $(APP5OBJS) \
- $(APP5LIBS) \
- $(APP5STDLIBS:^"-l") \
- $(APP5STDLIB:^"-l") $(STDLIB5:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP5LINKER) -v \
$(APP5LINKFLAGS) \
$(LINKFLAGSAPP) $(APP5BASEX) \
@@ -1401,8 +1321,8 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS)
$(APP5DEF) \
$(APP5OBJS) \
$(APP5LIBS) \
- $(APP5STDLIBS:^"-l") \
- $(APP5STDLIB:^"-l") $(STDLIB5:^"-l")
+ $(APP5STDLIBS) \
+ $(APP5STDLIB) $(STDLIB5)
.IF "$(APP5TARGET)" == "loader"
@@ -1639,11 +1559,11 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP6LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP6LINKRES:b).rc > $(NULLDEV)
.IF "$(APP6ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP6ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP6LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP6ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP6LINKRES:b).rc
.ENDIF # "$(APP6ICON)" != ""
.IF "$(APP6VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
@@ -1656,22 +1576,6 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
@echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP6LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP6BASEX) \
- $(APP6STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP6LINKRES) \
- $(APP6RES) \
- $(APP6DEF) \
- $(APP6OBJS) \
- $(APP6LIBS) \
- $(APP6STDLIBS:^"-l") \
- $(APP6STDLIB:^"-l") $(STDLIB6:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP6LINKER) -v \
$(APP6LINKFLAGS) \
$(LINKFLAGSAPP) $(APP6BASEX) \
@@ -1685,8 +1589,8 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS)
$(APP6DEF) \
$(APP6OBJS) \
$(APP6LIBS) \
- $(APP6STDLIBS:^"-l") \
- $(APP6STDLIB:^"-l") $(STDLIB6:^"-l")
+ $(APP6STDLIBS) \
+ $(APP6STDLIB) $(STDLIB6)
.IF "$(APP6TARGET)" == "loader"
@@ -1923,11 +1827,11 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP7LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP7LINKRES:b).rc > $(NULLDEV)
.IF "$(APP7ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP7ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP7LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP7ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP7LINKRES:b).rc
.ENDIF # "$(APP7ICON)" != ""
.IF "$(APP7VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
@@ -1940,22 +1844,6 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
@echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP7LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP7BASEX) \
- $(APP7STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP7LINKRES) \
- $(APP7RES) \
- $(APP7DEF) \
- $(APP7OBJS) \
- $(APP7LIBS) \
- $(APP7STDLIBS:^"-l") \
- $(APP7STDLIB:^"-l") $(STDLIB7:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP7LINKER) -v \
$(APP7LINKFLAGS) \
$(LINKFLAGSAPP) $(APP7BASEX) \
@@ -1969,8 +1857,8 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS)
$(APP7DEF) \
$(APP7OBJS) \
$(APP7LIBS) \
- $(APP7STDLIBS:^"-l") \
- $(APP7STDLIB:^"-l") $(STDLIB7:^"-l")
+ $(APP7STDLIBS) \
+ $(APP7STDLIB) $(STDLIB7)
.IF "$(APP7TARGET)" == "loader"
@@ -2207,11 +2095,11 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP8LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP8LINKRES:b).rc > $(NULLDEV)
.IF "$(APP8ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP8ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP8LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP8ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP8LINKRES:b).rc
.ENDIF # "$(APP8ICON)" != ""
.IF "$(APP8VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
@@ -2224,22 +2112,6 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
@echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP8LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP8BASEX) \
- $(APP8STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP8LINKRES) \
- $(APP8RES) \
- $(APP8DEF) \
- $(APP8OBJS) \
- $(APP8LIBS) \
- $(APP8STDLIBS:^"-l") \
- $(APP8STDLIB:^"-l") $(STDLIB8:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP8LINKER) -v \
$(APP8LINKFLAGS) \
$(LINKFLAGSAPP) $(APP8BASEX) \
@@ -2253,8 +2125,8 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS)
$(APP8DEF) \
$(APP8OBJS) \
$(APP8LIBS) \
- $(APP8STDLIBS:^"-l") \
- $(APP8STDLIB:^"-l") $(STDLIB8:^"-l")
+ $(APP8STDLIBS) \
+ $(APP8STDLIB) $(STDLIB8)
.IF "$(APP8TARGET)" == "loader"
@@ -2491,11 +2363,11 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP9LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP9LINKRES:b).rc > $(NULLDEV)
.IF "$(APP9ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP9ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP9LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP9ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP9LINKRES:b).rc
.ENDIF # "$(APP9ICON)" != ""
.IF "$(APP9VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
@@ -2508,22 +2380,6 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
@echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP9LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP9BASEX) \
- $(APP9STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP9LINKRES) \
- $(APP9RES) \
- $(APP9DEF) \
- $(APP9OBJS) \
- $(APP9LIBS) \
- $(APP9STDLIBS:^"-l") \
- $(APP9STDLIB:^"-l") $(STDLIB9:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP9LINKER) -v \
$(APP9LINKFLAGS) \
$(LINKFLAGSAPP) $(APP9BASEX) \
@@ -2537,8 +2393,8 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS)
$(APP9DEF) \
$(APP9OBJS) \
$(APP9LIBS) \
- $(APP9STDLIBS:^"-l") \
- $(APP9STDLIB:^"-l") $(STDLIB9:^"-l")
+ $(APP9STDLIBS) \
+ $(APP9STDLIB) $(STDLIB9)
.IF "$(APP9TARGET)" == "loader"
@@ -2775,11 +2631,11 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
.ENDIF # "$(GUI)" == "WNT"
.IF "$(GUI)" == "OS2"
- @+-$(MKDIR) $(@:d:d) >& $(NULLDEV)
+ @+-$(MKDIR) $(@:d:d) > $(NULLDEV)
.IF "$(APP10LINKRES)" != ""
- @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc >& $(NULLDEV)
+ @+-$(RM) $(MISC)/$(APP10LINKRES:b).rc > $(NULLDEV)
.IF "$(APP10ICON)" != ""
- @-+$(WRAPCMD) echo 1 ICON $(EMQ)"$(APP10ICON)$(EMQ)" | $(SED) 'sX\\X\\\\Xg' >> $(MISC)/$(APP10LINKRES:b).rc
+ @-+echo ICON 1 $(EMQ)"$(APP10ICON:s#/#\\\\#)$(EMQ)" >> $(MISC)$/$(APP10LINKRES:b).rc
.ENDIF # "$(APP10ICON)" != ""
.IF "$(APP10VERINFO)" != ""
@-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
@@ -2792,22 +2648,6 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
@echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def
.ENDIF
- .IF "$(VERBOSE)" == "TRUE"
- @+echo $(APP10LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP10BASEX) \
- $(APP10STACKN) \
- -o $@ \
- -Zmap -L$(LB) \
- -L$(SOLARVERSION)/$(INPATH)/lib \
- $(STDOBJ) \
- $(APP10LINKRES) \
- $(APP10RES) \
- $(APP10DEF) \
- $(APP10OBJS) \
- $(APP10LIBS) \
- $(APP10STDLIBS:^"-l") \
- $(APP10STDLIB:^"-l") $(STDLIB10:^"-l")
- .ENDIF
$(COMMAND_ECHO)$(APP10LINKER) -v \
$(APP10LINKFLAGS) \
$(LINKFLAGSAPP) $(APP10BASEX) \
@@ -2821,8 +2661,8 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIB
$(APP10DEF) \
$(APP10OBJS) \
$(APP10LIBS) \
- $(APP10STDLIBS:^"-l") \
- $(APP10STDLIB:^"-l") $(STDLIB10:^"-l")
+ $(APP10STDLIBS) \
+ $(APP10STDLIB) $(STDLIB10)
.IF "$(APP10TARGET)" == "loader"