[Libreoffice-commits] .: 4 commits - config_host.mk.in configure.in download external/prj external/rebase postprocess/prj postprocess/rebase
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 9 01:47:10 PDT 2012
config_host.mk.in | 1
configure.in | 11 -
download | 24 --
external/prj/d.lst | 2
external/rebase/README_rebase.exe | 1
postprocess/prj/build.lst | 7
postprocess/rebase/coffbase.txt | 391 --------------------------------------
postprocess/rebase/makefile.mk | 59 -----
postprocess/rebase/no_rebase.txt | 33 ---
postprocess/rebase/rebase.pl | 299 -----------------------------
10 files changed, 11 insertions(+), 817 deletions(-)
New commits:
commit 03c2bd42d03cd2cd3999d3527b59a14de2170756
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 9 10:32:14 2012 +0200
Kill rebasing all together - little advantage for a lot of hassle
Change-Id: I3bcf920d4c57ff05079033ab1715b61c14b86fd5
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index ad37e0d..f1fd67d 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -2,7 +2,6 @@ po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
-po postprocess\packregistry nmake - all po_packregistry NULL
-po postprocess\packcomponents nmake - all po_packcomponents NULL
-po postprocess\rebase nmake - w po_rebase NULL
-po postprocess\signing nmake - w,sign po_signing po_rebase.w NULL
+po postprocess\packregistry nmake - all po_packregistry NULL
+po postprocess\packcomponents nmake - all po_packcomponents NULL
+po postprocess\signing nmake - w,sign po_signing NULL
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
deleted file mode 100644
index 4fe3a25..0000000
--- a/postprocess/rebase/coffbase.txt
+++ /dev/null
@@ -1,391 +0,0 @@
-abpmi.dll 0x0000000067fd0000 0x00020000
-acceptor.uno.dll 0x0000000067fb0000 0x00010000
-accmi.dll 0x0000000067f00000 0x000a0000
-adabasuimi.dll 0x0000000067e60000 0x00020000
-ado2.dll 0x0000000067dd0000 0x00080000
-affine_uno_uno.dll 0x0000000067db0000 0x00010000
-aggmi.dll 0x0000000067d70000 0x00030000
-analysismi.dll 0x0000000067d20000 0x00040000
-animcore.dll 0x0000000067cf0000 0x00020000
-avmediami.dll 0x0000000067ca0000 0x00040000
-avmediawin.dll 0x0000000067c70000 0x00020000
-basctlmi.dll 0x0000000067ba0000 0x000c0000
-basebmpmi.dll 0x00000000678a0000 0x002f0000
-basegfxmi.dll 0x0000000067820000 0x00070000
-basprovmi.uno.dll 0x00000000677f0000 0x00020000
-behelper.uno.dll 0x00000000677a0000 0x00010000
-bf_frmmi.dll 0x00000000676b0000 0x000e0000
-bf_gomi.dll 0x0000000067680000 0x00020000
-bf_migratefiltermi.dll 0x0000000067660000 0x00010000
-bf_ofami.dll 0x0000000067640000 0x00010000
-bf_sbmi.dll 0x00000000675b0000 0x00080000
-bf_schmi.dll 0x0000000067500000 0x000a0000
-bf_scmi.dll 0x00000000672a0000 0x00250000
-bf_sdmi.dll 0x00000000671f0000 0x000a0000
-bf_smmi.dll 0x0000000067190000 0x00050000
-bf_somi.dll 0x00000000670f0000 0x00090000
-bf_svtmi.dll 0x0000000066f30000 0x001b0000
-bf_svxmi.dll 0x0000000066b50000 0x003d0000
-bf_swmi.dll 0x00000000668b0000 0x00290000
-bf_wrappermi.dll 0x0000000066880000 0x00020000
-bf_xomi.dll 0x0000000066480000 0x003f0000
-bibmi.dll 0x0000000066430000 0x00040000
-bindetmi.dll 0x0000000066410000 0x00010000
-bootstrap.uno.dll 0x0000000066380000 0x00080000
-bootstrpdtmi.dll 0x0000000066350000 0x00020000
-bridgefac.uno.dll 0x0000000066330000 0x00010000
-cached1.dll 0x00000000662b0000 0x00030000
-calcmi.dll 0x0000000066260000 0x00040000
-canvasfactory.uno.dll 0x0000000066240000 0x00010000
-canvastoolsmi.dll 0x00000000661b0000 0x00080000
-chartcontrollermi.dll 0x0000000066030000 0x00170000
-chartmodelmi.dll 0x0000000065f70000 0x000b0000
-charttoolsmi.dll 0x0000000065dd0000 0x00190000
-chartviewmi.dll 0x0000000065c60000 0x00160000
-cli_uno.dll 0x0000000065c20000 0x00030000
-collator_data.dll 0x0000000065aa0000 0x00170000
-communimi.dll 0x0000000065a80000 0x00010000
-comphelp4msc.dll 0x0000000065980000 0x000f0000
-configmgr.uno.dll 0x000000005adb0000 0x00070000
-connector.uno.dll 0x00000000657e0000 0x00010000
-cppcanvasmi.dll 0x0000000065780000 0x00050000
-cppu3.dll 0x0000000065740000 0x00030000
-cppuhelper3msc.dll 0x00000000656c0000 0x00070000
-ctlmi.dll 0x0000000065680000 0x00030000
-cuimi.dll 0x00000000654a0000 0x001d0000
-datemi.dll 0x0000000065470000 0x00020000
-dbami.dll 0x00000000652e0000 0x00150000
-dbasemi.dll 0x0000000065280000 0x00050000
-dbaxmlmi.dll 0x0000000065230000 0x00040000
-dbmmmi.dll 0x0000000065200000 0x00020000
-dbpmi.dll 0x00000000651c0000 0x00030000
-dbpool2.dll 0x0000000065190000 0x00020000
-dbtoolsmi.dll 0x0000000064f60000 0x00220000
-dbumi.dll 0x0000000064ce0000 0x00270000
-deploymentguimi.uno.dll 0x0000000064c60000 0x00070000
-deploymentmi.uno.dll 0x0000000064be0000 0x00070000
-deploymentmiscmi.dll 0x0000000064bb0000 0x00020000
-dfami.dll 0x0000000064b40000 0x00010000
-dict_ja.dll 0x0000000064a20000 0x00110000
-dict_zh.dll 0x00000000647e0000 0x00230000
-directx5canvas.uno.dll 0x0000000064760000 0x00070000
-directx9canvas.uno.dll 0x00000000646e0000 0x00070000
-dlgprovmi.uno.dll 0x00000000646b0000 0x00020000
-dnd.dll 0x0000000064680000 0x00020000
-doctok.dll 0x00000000645c0000 0x000b0000
-dtrans.dll 0x00000000645a0000 0x00010000
-dynamicloader.uno.dll 0x0000000064570000 0x00020000
-egimi.dll 0x0000000064550000 0x00010000
-embobj.dll 0x00000000644d0000 0x00070000
-emboleobj.dll 0x0000000064480000 0x00040000
-ememi.dll 0x0000000064460000 0x00010000
-empmi.dll 0x0000000064410000 0x00040000
-emsermi.dll 0x00000000643d0000 0x00030000
-epbmi.dll 0x00000000643b0000 0x00010000
-epgmi.dll 0x0000000064390000 0x00010000
-eppmi.dll 0x0000000064370000 0x00010000
-epsmi.dll 0x0000000064340000 0x00020000
-eptmi.dll 0x0000000064320000 0x00010000
-erami.dll 0x0000000064300000 0x00010000
-etimi.dll 0x00000000642e0000 0x00010000
-evtatt.dll 0x00000000642c0000 0x00010000
-expmi.dll 0x0000000064280000 0x00010000
-fastsax.uno.dll 0x0000000064240000 0x00030000
-fileacc.dll 0x0000000064220000 0x00010000
-filemi.dll 0x0000000064140000 0x000d0000
-filterconfig1.dll 0x00000000640f0000 0x00040000
-filtertracermi.dll 0x00000000640d0000 0x00010000
-flashmi.dll 0x0000000064090000 0x00030000
-flatmi.dll 0x0000000064040000 0x00040000
-fpicker.uno.dll 0x0000000064000000 0x00010000
-fps.dll 0x0000000063fc0000 0x00030000
-fps_office.uno.dll 0x0000000063f70000 0x00040000
-frmmi.dll 0x0000000063dd0000 0x00190000
-fsstorage.uno.dll 0x0000000063da0000 0x00020000
-ftransl.dll 0x0000000063d80000 0x00010000
-fwemi.dll 0x0000000063c90000 0x000e0000
-fwimi.dll 0x0000000063c30000 0x00050000
-fwkmi.dll 0x0000000063a50000 0x001d0000
-fwlmi.dll 0x0000000063a20000 0x00020000
-fwmmi.dll 0x00000000639f0000 0x00020000
-gdipluscanvas.uno.dll 0x0000000063980000 0x00060000
-gomi.dll 0x00000000638b0000 0x00060000
-guesslangmi.dll 0x0000000063890000 0x00010000
-hatchwindowfactory.uno.dll 0x0000000063860000 0x00020000
-helplinkermi.dll 0x0000000063820000 0x00030000
-hsqldb2.dll 0x00000000637d0000 0x00040000
-hwp.dll 0x0000000063740000 0x00080000
-hyphenmi.dll 0x0000000063710000 0x00020000
-i18nisolang1msc.dll 0x00000000636f0000 0x00010000
-i18npool.uno.dll 0x00000000635b0000 0x00130000
-i18nregexpmsc.dll 0x0000000063590000 0x00010000
-i18nsearch.uno.dll 0x0000000063570000 0x00010000
-i18nutilmsc.dll 0x0000000063540000 0x00020000
-icdmi.dll 0x0000000063520000 0x00010000
-icgmi.dll 0x00000000634f0000 0x00020000
-icudt40.dll 0x0000000059bb0000 0x00d50000
-icuin40.dll 0x0000000059a90000 0x00110000
-icule40.dll 0x0000000059a40000 0x00040000
-icutu40.dll 0x0000000059a10000 0x00020000
-icuuc40.dll 0x0000000059910000 0x000f0000
-idxmi.dll 0x0000000062880000 0x00020000
-imemi.dll 0x0000000062860000 0x00010000
-index_data.dll 0x00000000627c0000 0x00090000
-instooofiltmsi.dll 0x0000000062790000 0x00020000
-introspection.uno.dll 0x0000000062760000 0x00020000
-invocadapt.uno.dll 0x0000000062740000 0x00010000
-invocation.uno.dll 0x0000000062720000 0x00010000
-ipbmi.dll 0x0000000062700000 0x00010000
-ipdmi.dll 0x00000000626e0000 0x00010000
-ipsmi.dll 0x00000000626c0000 0x00010000
-iptmi.dll 0x00000000626a0000 0x00010000
-ipxmi.dll 0x0000000062680000 0x00010000
-irami.dll 0x0000000062660000 0x00010000
-itgmi.dll 0x0000000062640000 0x00010000
-itimi.dll 0x0000000062620000 0x00010000
-java_uno.dll 0x00000000625f0000 0x00020000
-java_uno_accessbridge.dll 0x00000000625d0000 0x00010000
-javaloader.uno.dll 0x00000000625b0000 0x00010000
-javavm.uno.dll 0x0000000062580000 0x00020000
-jdbc2.dll 0x0000000062510000 0x00060000
-jfregca.dll 0x00000000624d0000 0x00030000
-jmi_g.dll 0x00000000624b0000 0x00010000
-jpipe.dll 0x0000000062490000 0x00010000
-juh.dll 0x00000000623b0000 0x00010000
-juhx.dll 0x0000000062380000 0x00020000
-jvmaccess3msc.dll 0x0000000062360000 0x00010000
-jvmfwk3.dll 0x0000000062330000 0x00020000
-ldapbe2.uno.dll 0x0000000062300000 0x00020000
-legacy_binfiltersmi.dll 0x00000000622d0000 0x00020000
-libcurl.dll 0x0000000062290000 0x00030000
-libdb47.dll 0x00000000621f0000 0x00090000
-libeay32.dll 0x00000000620d0000 0x00110000
-libexslt.dll 0x00000000620a0000 0x00020000
-librdf.dll 0x0000000062070000 0x00020000
-libtextcat.dll 0x0000000062050000 0x00010000
-libxml2.dll 0x0000000061f50000 0x000f0000
-libxmlsec-mscrypto.dll 0x0000000061f10000 0x00030000
-libxmlsec.dll 0x0000000061eb0000 0x00050000
-libxslt.dll 0x0000000061e70000 0x00030000
-lngpckinsthlp.dll 0x0000000061cc0000 0x00040000
-lnthmi.dll 0x0000000061c90000 0x00020000
-localebe1.uno.dll 0x0000000061c70000 0x00010000
-localedata_en.dll 0x0000000061c40000 0x00020000
-localedata_es.dll 0x0000000061c10000 0x00020000
-localedata_euro.dll 0x0000000061b60000 0x000a0000
-localedata_others.dll 0x0000000061aa0000 0x000b0000
-logmi.dll 0x0000000061a70000 0x00020000
-lpsolve55.dll 0x0000000061970000 0x00070000
-mcnttype.dll 0x0000000061950000 0x00010000
-mozabmi.dll 0x00000000597a0000 0x00020000
-mozabdrvmi.dll 0x00000000597d0000 0x00070000
-msci_uno.dll 0x0000000061860000 0x00010000
-mysql2.dll 0x0000000061820000 0x00030000
-namingservice.uno.dll 0x0000000061800000 0x00010000
-npsoplugin.dll 0x00000000617e0000 0x00010000
-npsoplugin_so.dll 0x00000000617c0000 0x00010000
-nullcanvas.uno.dll 0x0000000061770000 0x00040000
-odbc2.dll 0x0000000061750000 0x00010000
-odbcbase2.dll 0x0000000061690000 0x000b0000
-offaccmi.dll 0x0000000061670000 0x00010000
-officebean.dll 0x0000000061650000 0x00010000
-oleautobridge.uno.dll 0x00000000615f0000 0x00050000
-oleautobridge2.uno.dll 0x0000000061590000 0x00050000
-onlinecheck.dll 0x0000000061570000 0x00010000
-ooofilt.dll 0x0000000061530000 0x00030000
-ooofiltproxy.dll 0x0000000061500000 0x00020000
-ooxmi.dll 0x0000000061190000 0x00340000
-ooxml.dll 0x0000000060f20000 0x00260000
-package2.dll 0x0000000060ec0000 0x00050000
-passwordcontainer.uno.dll 0x0000000060e90000 0x00020000
-patchmsi.dll 0x0000000060e30000 0x00050000
-pcrmi.dll 0x0000000060d40000 0x000e0000
-pdffiltermi.dll 0x0000000060d00000 0x00030000
-pdfimport.uno.dll 0x0000000060bf0000 0x000a0000
-placewaremi.dll 0x0000000060bd0000 0x00010000
-plmi.dll 0x0000000060b90000 0x00030000
-pptimportermi.dll 0x0000000060b70000 0x00010000
-protocolhandlermi.dll 0x0000000060b00000 0x00010000
-proxyfac.uno.dll 0x0000000060ae0000 0x00010000
-purpenvhelper3msc.dll 0x0000000060ac0000 0x00010000
-python23.dll 0x00000000609b0000 0x00100000
-pythonloader.uno.dll 0x0000000060990000 0x00010000
-pyuno.dll 0x0000000060930000 0x00050000
-qslnkmsi.dll 0x00000000608e0000 0x00040000
-raptor.dll 0x0000000060880000 0x00050000
-rasqal.dll 0x0000000060840000 0x00030000
-reflection.uno.dll 0x0000000060810000 0x00020000
-reg3.dll 0x00000000607e0000 0x00020000
-reg4allmsdoc.dll 0x0000000060790000 0x00040000
-regactivex.dll 0x0000000060710000 0x00020000
-regpatchactivex.dll 0x0000000060690000 0x00020000
-remotebridge.uno.dll 0x0000000060640000 0x00010000
-resmi.dll 0x0000000060610000 0x00020000
-resourcemodel.dll 0x0000000060580000 0x00080000
-rmcxt3.dll 0x00000000604f0000 0x00010000
-rotmi.dll 0x00000000604d0000 0x00010000
-rptmi.dll 0x0000000060400000 0x000c0000
-rptuimi.dll 0x0000000060320000 0x000d0000
-rptxmlmi.dll 0x00000000602c0000 0x00050000
-sal3.dll 0x0000000060100000 0x001b0000
-salhelper3msc.dll 0x00000000600e0000 0x00010000
-sax.uno.dll 0x00000000600a0000 0x00030000
-saxmi.dll 0x0000000060080000 0x00010000
-sbmi.dll 0x000000005ff20000 0x00150000
-scdmi.dll 0x000000005ff00000 0x00010000
-scmi.dll 0x000000005f820000 0x006d0000
-scnmi.dll 0x000000005f800000 0x00010000
-scriptframe.dll 0x000000005f7c0000 0x00030000
-scuimi.dll 0x000000005f760000 0x00050000
-sdbc2.dll 0x000000005f730000 0x00020000
-sdbtmi.dll 0x000000005f700000 0x00020000
-sddmi.dll 0x000000005f6e0000 0x00010000
-sdmi.dll 0x000000005f2a0000 0x00430000
-sdqsmsi.dll 0x000000005f250000 0x00040000
-sduimi.dll 0x000000005f1d0000 0x00070000
-sfxmi.dll 0x000000005eed0000 0x002f0000
-shlxthdl.dll 0x000000005ee60000 0x00060000
-shlxtmsi.dll 0x000000005ee00000 0x00050000
-simplecanvas.uno.dll 0x000000005ede0000 0x00010000
-simplecmmi.dll 0x000000005edc0000 0x00010000
-slideshow.uno.dll 0x000000005ec60000 0x00150000
-slideshowtestmi.dll 0x000000005e8b0000 0x003a0000
-smdmi.dll 0x000000005e890000 0x00010000
-smmi.dll 0x000000005e7f0000 0x00090000
-smplmail.uno.dll 0x000000005e7d0000 0x00010000
-sn_tools.dll 0x000000005e7a0000 0x00020000
-so_activex.dll 0x000000005e770000 0x00020000
-sofficeapp.dll 0x000000005e6e0000 0x00060000
-soldepmi.dll 0x000000005e6a0000 0x00030000
-solvermi.dll 0x000000005e680000 0x00010000
-sotmi.dll 0x000000005e620000 0x00050000
-spellmi.dll 0x000000005e5e0000 0x00030000
-splmi.dll 0x000000005e5a0000 0x00030000
-srtrs1.dll 0x000000005e570000 0x00020000
-ssleay32.dll 0x000000005e520000 0x00040000
-stlport_vc7145.dll 0x000000005e470000 0x000a0000
-stlport_vc71_stldebug45.dll 0x000000005e340000 0x00120000
-stocservices.uno.dll 0x000000005e310000 0x00020000
-store3.dll 0x000000005e2e0000 0x00020000
-streams.uno.dll 0x000000005e2b0000 0x00020000
-stringresourcemi.uno.dll 0x000000005e280000 0x00020000
-stsmi.dll 0x000000005e1f0000 0x00080000
-libsunjavaplugin.dll 0x000000005e1c0000 0x00020000
-svgfiltermi.dll 0x000000005e190000 0x00020000
-svgmi.dll 0x000000005e160000 0x00020000
-svlmi.dll 0x000000005e090000 0x000c0000
-svtmi.dll 0x000000005ddc0000 0x002c0000
-svtmisc.uno.dll 0x000000005dd90000 0x00020000
-svxmi.dll 0x000000005d4c0000 0x008c0000
-swdmi.dll 0x000000005d490000 0x00020000
-swmi.dll 0x000000005cd00000 0x00780000
-swuimi.dll 0x000000005cbc0000 0x00130000
-sysdtrans.dll 0x000000005cb90000 0x00020000
-sysmgr1.uno.dll 0x000000005cb70000 0x00010000
-syssh.uno.dll 0x000000005cb50000 0x00010000
-t602filtermi.dll 0x000000005cb20000 0x00020000
-textconv_dict.dll 0x000000005c9e0000 0x00040000
-textconversiondlgsmi.dll 0x000000005c9b0000 0x00020000
-textinstream.uno.dll 0x000000005c990000 0x00010000
-textoutstream.uno.dll 0x000000005c970000 0x00010000
-tfumi.dll 0x000000005c950000 0x00010000
-tkmi.dll 0x000000005c7c0000 0x00180000
-tlmi.dll 0x000000005c730000 0x00080000
-tvhlp1.dll 0x000000005c6f0000 0x00030000
-ucb1.dll 0x000000005c6a0000 0x00040000
-ucbhelper4msc.dll 0x000000005c630000 0x00060000
-ucpchelp1.dll 0x000000005c5e0000 0x00040000
-ucpdav1.dll 0x000000005c570000 0x00060000
-ucpexpand1.uno.dll 0x000000005c550000 0x00010000
-ucpfile1.dll 0x000000005c500000 0x00040000
-ucpftp1.dll 0x000000005c4c0000 0x00030000
-ucphier1.dll 0x000000005c480000 0x00030000
-ucppkg1.dll 0x000000005c440000 0x00030000
-ucptdoc1.uno.dll 0x000000005c3f0000 0x00040000
-udlgmi.dll 0x000000005c3d0000 0x00010000
-unopkgapp.dll 0x000000005c3a0000 0x00020000
-unordfmi.dll 0x000000005c360000 0x00030000
-unowinreg.dll 0x000000005c340000 0x00010000
-unoxmlmi.dll 0x000000005c2e0000 0x00050000
-unsafe_uno_uno.dll 0x000000005c2c0000 0x00010000
-updatefeed.uno.dll 0x000000005c290000 0x00020000
-updchk.uno.dll 0x000000005c250000 0x00030000
-updchkmi.dll 0x000000005c230000 0x00010000
-urp_uno.dll 0x000000005c200000 0x00020000
-utlmi.dll 0x000000005c170000 0x00080000
-uuimi.dll 0x000000005c130000 0x00030000
-uuresolver.uno.dll 0x000000005c110000 0x00010000
-uwinapi.dll 0x000000005c0e0000 0x00020000
-vbaobjmi.uno.dll 0x000000005bfd0000 0x00100000
-vclcanvas.uno.dll 0x000000005bf50000 0x00070000
-vclmi.dll 0x000000005bc50000 0x002f0000
-vos3msc.dll 0x000000005bc20000 0x00020000
-wininetbe1.uno.dll 0x000000005bc00000 0x00010000
-writerfilter.uno.dll 0x000000005bb30000 0x00010000
-writerfiltermi.dll 0x000000005b760000 0x003c0000
-xcrmi.dll 0x000000005b6c0000 0x00090000
-xmergesync.dll 0x000000005b690000 0x00020000
-xmlfami.dll 0x000000005b670000 0x00010000
-xmlfdmi.dll 0x000000005b650000 0x00010000
-xmlsecurity.dll 0x000000005b600000 0x00040000
-xofmi.dll 0x000000005b580000 0x00050000
-xomi.dll 0x000000005b2b0000 0x002c0000
-xsec_fw.dll 0x000000005b280000 0x00020000
-xsec_xmlsec.dll 0x000000005b250000 0x00020000
-xsltdlgmi.dll 0x000000005b200000 0x00040000
-xsltfiltermi.dll 0x000000005b1e0000 0x00010000
-xstor.dll 0x000000005b190000 0x00040000
-npsoplugin.dll 0x000000005b0b0000 0x00010000
-migrationoo2.uno.dll 0x000000005b080000 0x00020000
-inprocserv.dll 0x000000005b060000 0x00010000
-lngmi.dll 0x000000005af50000 0x00100000
-adomi.dll 0x000000005aea0000 0x00080000
-cppunit_dll.dll 0x000000005ad60000 0x00040000
-drawinglayermi.dll 0x000000005ac00000 0x00100000
-editengmi.dll 0x000000005aa80000 0x00170000
-formi.dll 0x000000005aa30000 0x00020000
-foruimi.dll 0x000000005a9f0000 0x00030000
-freebl3.dll 0x000000005a9a0000 0x00040000
-hsqldb.dll 0x000000005a950000 0x00040000
-i18npapermi.dll 0x000000005a930000 0x00010000
-jdbcmi.dll 0x00000000598b0000 0x00050000
-jpipx.dll 0x0000000059890000 0x00010000
-log_uno_uno.dll 0x0000000059870000 0x00010000
-migrationoo3.uno.dll 0x0000000059850000 0x00010000
-msfiltermi.dll 0x00000000596e0000 0x000b0000
-msformsmi.uno.dll 0x0000000059680000 0x00050000
-mswordmi.dll 0x0000000059560000 0x00110000
-mysqlcppconn.dll 0x00000000594c0000 0x00090000
-mysqlmi.dll 0x0000000059480000 0x00030000
-neon.dll 0x0000000059450000 0x00020000
-nspr4.dll 0x0000000059410000 0x00030000
-nss3.dll 0x0000000059330000 0x000d0000
-nssckbi.dll 0x00000000592c0000 0x00060000
-nssdbm3.dll 0x0000000059290000 0x00020000
-nssutil3.dll 0x0000000059260000 0x00020000
-odbcbasemi.dll 0x00000000591f0000 0x00060000
-odbcmi.dll 0x00000000591d0000 0x00010000
-ooofilt_x64.dll 0x0000000059130000 0x00090000
-plc4.dll 0x00000000590e0000 0x00010000
-plds4.dll 0x00000000590c0000 0x00010000
-propertyhdl.dll 0x0000000059070000 0x00040000
-propertyhdl_x64.dll 0x0000000058fe0000 0x00080000
-python26.dll 0x0000000058da0000 0x00230000
-rebase.dll 0x0000000058d50000 0x00040000
-reg64msi.dll 0x0000000058cc0000 0x00030000
-scfiltmi.dll 0x0000000058aa0000 0x001c0000
-sdfiltmi.dll 0x0000000058a20000 0x00070000
-shlxthdl_x64.dll 0x0000000058940000 0x000d0000
-smime3.dll 0x0000000058910000 0x00020000
-so_activex_x64.dll 0x00000000588c0000 0x00040000
-softokn3.dll 0x0000000058880000 0x00030000
-sqlite3.dll 0x00000000587c0000 0x00070000
-ssl3.dll 0x0000000058780000 0x00030000
-svxcoremi.dll 0x0000000058230000 0x00540000
-test.dll 0x0000000058120000 0x00010000
-test_converter.dll 0x0000000058100000 0x00010000
-ucpext.uno.dll 0x00000000580d0000 0x00020000
-ucpmyucp1.uno.dll 0x00000000580a0000 0x00020000
-vbaeventsmi.uno.dll 0x0000000058070000 0x00020000
-vbahelpermi.dll 0x0000000057fc0000 0x000a0000
-vbaswobjmi.uno.dll 0x0000000057ef0000 0x000c0000
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
deleted file mode 100644
index c5d7615..0000000
--- a/postprocess/rebase/makefile.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-#***********************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-
-PRJNAME=postprocess
-TARGET=rebase
-
-.INCLUDE : settings.mk
-
-.INCLUDE : target.mk
-
-STARTADDRESS=0x68000000
-BASEADDRESSES=$(MISC)$/coffbase.txt
-EXCLUDELIST=no_rebase.txt
-LOGFILE=$(MISC)$/rebase_log.txt
-IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll
-
-ALLTAR : REBASE
-
-REBASE .PHONY : $(BASEADDRESSES)
-.IF "$(GUI)$(COM)$(CPUNAME)"=="WNTMSCINTEL"
-.IF "$(product)"=="full"
- $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
-.ELSE # "$(product)"=="full"
- @echo Doing nothing on non product builds ...
-.ENDIF # "$(product)"=="full"
-.ELSE # "$(GUI)"=="WNTI"
- @echo We do rebasing on 32-bit Windows only built with MSVC.
-.ENDIF
-
-$(BASEADDRESSES) : coffbase.txt
- $(COPY) coffbase.txt $@
-
diff --git a/postprocess/rebase/no_rebase.txt b/postprocess/rebase/no_rebase.txt
deleted file mode 100644
index 9a3aabf..0000000
--- a/postprocess/rebase/no_rebase.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cli_basetypes.dll
-cli_cppuhelper.dll
-cli_uretypes.dll
-cli_oootypes.dll
-cli_ure.dll
-policy.1.0.cli_uretypes.dll
-policy.1.0.cli_oootypes.dll
-policy.1.0.cli_ure.dll
-policy.1.0.cli_cppuhelper.dll
-policy.1.0.cli_basetypes.dll
-gdiplus.dll
-mingwm10.dll
-msvcm80d.dll
-msvcm80.dll
-msvcm90d.dll
-msvcm90.dll
-msvcp70d.dll
-msvcp70.dll
-msvcp71d.dll
-msvcp71.dll
-msvcp80d.dll
-msvcp80.dll
-msvcp90d.dll
-msvcp90.dll
-msvcr70d.dll
-msvcr70.dll
-msvcr71d.dll
-msvcr71.dll
-msvcr80d.dll
-msvcr80.dll
-msvcr90d.dll
-msvcr90.dll
-dbghelp.dll
diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl
deleted file mode 100644
index 546068e..0000000
--- a/postprocess/rebase/rebase.pl
+++ /dev/null
@@ -1,287 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
- if 0;
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-#
-# rebase.pl - rebase windows dlls
-#
-# This perl script is to rebase all windows dlls. In principle this could
-# be done with one simple command line like f.e.
-# rebase -b 0x68000000 -d -R foo_dir -N bar.txt $(SOLARBINDIR)$/*.dll
-# That would work fine for creating complete office install sets, but it
-# could fail as soon as we are going to ship single dlls for a product
-# patch. Therefore, this wrapper perl script is used. It reads a given base
-# address file and rebases all files mentioned to the same address as
-# previously. New dlls get appended to the list.
-
-use strict;
-
-#### globals #####
-
-my $myname = '';
-my $options_string = ''; # order of options is important
-my %options_hash;
-my $rebase_files;
-my $misc_dir = $ENV{TEMP};
-my $lastaddress;
-my @old_files;
-my @new_files;
-
-#### main #####
-
-$myname = script_id();
-parse_options();
-my %lastrun = read_coffbase( \$lastaddress );
-# Get files specified on command line. Differ between those already
-# listed in coffbase (%options_hash{'C'}) and additional ones.
-get_files( \@old_files, \@new_files );
-# Rebase libraries already listed in coffbase to the addresses given there.
-rebase_again( \@old_files, \@new_files ) if ( @old_files );
-# Rebase additional files.
-rebase_initially( \@new_files, $lastaddress ) if ( @new_files );
-
-exit 0;
-
-
-#### subroutines ####
-
-sub script_id
-{
- ( my $script_name = $0 ) =~ s/^.*[\\\/]([\w\.]+)$/$1/;
- return $script_name;
-}
-
-
-sub parse_options
-{
- use Getopt::Std;
- if ( !getopts('C:b:de:l:m:R:N:v', \%options_hash) || ($#ARGV < 0) ) {
- print STDERR "Error: invalid command line.\n\n";
- usage ();
- exit 1;
- }
- # create options string (we cannot rely on a hash because for some options the
- # order is important. -R option has to be specified before -N!)
- foreach my $var ( 'C', 'b', 'e', 'l', 'R', 'N' ) {
- if ($options_hash{$var} ) {
- $options_string .= "-$var $options_hash{$var} ";
- }
- }
- $options_string .= "-d " if $options_hash{"d"};
- $options_string .= "-v " if $options_hash{"v"};
- # some basic tests
- if ( ! $options_hash{'C'}) {
- print STDERR "Error: no coffbase specified\n\n";
- usage ();
- exit 2;
- }
- if ( ! $options_hash{'b'}) {
- print STDERR "Error: no initial base address specified\n\n";
- usage ();
- exit 2;
- }
- if ($options_hash{"m"}) {
- $misc_dir = $options_hash{"m"};
- }
- if ( ! -d $misc_dir ) {
- print STDERR "Error: no directory to write work files. Please specify with -m\n";
- usage ();
- exit 3;
- }
- if ( $misc_dir !~ /[\/\\]$/ ) {
- # append finishing path separator:
- if ( $misc_dir =~ /([\/\\])/ ) {
- $misc_dir .= $1;
- }
- }
- $rebase_files = join " ", @ARGV;
- # Cygwin's perl in a W32-4nt configuration wants / instead of \ .
- $rebase_files =~ s/\\/\//g;
- return;
-}
-
-
-sub read_coffbase
-{
- my ($addref) = shift;
- my %baseaddresses;
- my @entry;
- if ( $options_hash{'C'} ) {
- my $filename = $options_hash{'C'};
- if ( -e $filename ) {
- print "Repeated run, $filename present\n";
- open( COFFBASE, $filename) or die "Error: cannot open $filename";
- while ( my $line = <COFFBASE> ) {
- # each row consists of three entries, separated by white space:
- # dll-name base-address size
- @entry = split /\s+/ , $line ;
- if ( $entry[3] || ( ! $entry[2] ) ) {
- print STDERR "Warning: coffbase file structure invalid?\n";
- }
- $baseaddresses{$entry[0]} = $entry[1];
- if ( $entry[3] ) {
- print STDERR "Warning: coffbase file structure invalid?\n";
- }
- }
- close( COFFBASE );
- $$addref = $entry[1];
- } else {
- print "Initial run, $filename not yet present\n";
- }
- } else {
- die "Error: no coffbase specified.";
- }
- return %baseaddresses;
-}
-
-
-sub get_files
-{
- use File::Basename;
- my ( $oldfiles_ref, $newfiles_ref ) = @_;
- my @target = split / /, $rebase_files;
- foreach my $pattern ( @target ) {
- foreach my $i ( glob( $pattern ) ) {
- my $lib = File::Basename::basename $i;
- $lib =~ s/\+/\\\+/g;
- if ( grep /^$lib$/i, (keys %lastrun) ) {
- push @$oldfiles_ref, $i;
- } else {
- push @$newfiles_ref, $i;
- }
- }
- }
- return;
-}
-
-
-sub rebase_again
-# rebase using given coffbase file
-{
- my $oldfiles_ref = shift;
- my $newfiles_ref = shift;
- my @grownfiles;
- my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}";
- my $command = "rebase " . $options_string;
- if ( $ENV{WRAPCMD} ) {
- $command = $ENV{WRAPCMD} . " " . $command;
- }
- $command =~ s/-C /-i /;
- $command =~ s/-d//;
- $command =~ s/-b $options_hash{'b'}//;
- my $fname = $misc_dir . "rebase_again.txt";
- open ( FILES, "> $fname") or die "Error: cannot open file $fname";
- my $filesstring = join " ", @$oldfiles_ref;
- print FILES "$filesstring\n";
- close FILES;
- $command .= "\@$fname";
- # Cygwin's perl needs escaped \ in system() and open( COMMAND ... )
- if ( "$^O" eq "cygwin" ) { $command =~ s/\\/\\\\/g; }
- print "\n$command\n";
- open( COMMAND, "$command 2>&1 |") or die "Error: Can't execute $command\n";
- if ( $? ) {
- die "Error: rebase failed: $?!\n";
- }
- while( <COMMAND> ) {
- print;
- # evaluate error messages
- if ( /REBASE: ([^\s]+).*Grew too large/ ) {
- my $toobig_name = $1;
- if ( -e "$solarbin/so/$toobig_name" ) {
- push @grownfiles, "$solarbin/so/$toobig_name";
- print "name was : $toobig_name\n";
- print "push $solarbin/so/$toobig_name\n";
- } else {
- push @grownfiles, "$solarbin/$toobig_name";
- }
- }
- }
- close( COMMAND );
- if ( @grownfiles ) {
- # Some files are larger than expected and therefore could not be rebased.
- # Remove respective entries from coffbase and schedule rebase in 'rebase_initially'.
- push @$newfiles_ref, @grownfiles;
- my $coffbase = $options_hash{'C'};
- my $coffbase_new = $options_hash{'C'} . ".new";
- open( COFFBASENEW, "> $coffbase_new") or die "Error: cannot open $coffbase_new";
- open( COFFBASE, $coffbase) or die "Error: cannot open $coffbase";
- my @entry;
- while ( my $line = <COFFBASE> ) {
- @entry = split /\s+/ , $line ;
- if ( $entry[3] ) {
- print STDERR "Warning: coffbase file structure invalid?\n";
- }
- grep /^$entry[0]$/, @grownfiles or print COFFBASENEW $line;
- }
- close( COFFBASE );
- close( COFFBASENEW );
- rename $coffbase, $coffbase . ".old" or warn "Error: cannot rename $coffbase";
- rename $coffbase_new, $coffbase or warn "Error: cannot rename $coffbase_new";
- }
-}
-
-
-sub rebase_initially
-{
- my ($files_ref, $start_address) = @_;
- my $command = "rebase ";
- if ( $ENV{WRAPCMD} ) {
- $command = $ENV{WRAPCMD} . " " . $command;
- }
- $command .= $options_string;
- if ( $start_address ) {
- $command =~ s/-b $options_hash{'b'}/ -b $start_address/;
- }
- my $fname = $misc_dir . "rebase_new.txt";
- open ( FILES, "> $fname") or die "Error: cannot open file $fname";
- my $filesstring = join " ", @$files_ref;
- print FILES "$filesstring\n";
- close FILES;
- $command .= "\@$fname";
- # Cygwin's perl needs escaped \ in system() and open( COMMAND ... )
- if ( "$^O" eq "cygwin" ) { $command =~ s/\\/\\\\/g; }
- print "\n$command\n";
- my $error = system("$command");
- if ($error) {
- $error /= 256;
- die "Error: rebase failed with exit code $error!\n";
- }
-}
-
-
-sub usage
-{
- print "Usage:\t $myname <-C filename> <-b address> [-d] [-e <Size>] [-l <filename>] [-v] [-m dir] [-R <roordir>] [-N <filename>] <file[list]> \n";
- # Options similar to rebase binary. Additional options: -m misc-directory
- print "Options:\n";
- print "\t -C coffbase_filename Write the list of base adresses to file coffbase_filename. ";
- print "Mandatory.\n";
- print "\t -b address Initial base address. Mandatory.\n";
- print "\t -e SizeAdjustment Extra size to allow for image growth.\n";
- print "\t -d Top down rebase.\n";
- print "\t -l filename Write logfile filename.\n";
- print "\t -m directory Directory to write work files.\n";
- print "\t -R directory Root directory.\n";
- print "\t -N filename Specify list of files not to be rebased.\n";
- print "\t -v Verbose.\n";
- return;
-}
-
-
commit 55754a818f38165f7bf2274f6502709acd18a056
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 9 10:42:26 2012 +0200
Revert "Win8 SDK no longer ships rebase.exe"
This reverts commit 79fce4ddeb8b45fd047a97507051cd9ca4245f60.
Conflicts:
configure.in
download
Change-Id: Ica8691c5ff5d3e70538d029ed33a91621405af94
diff --git a/config_host.mk.in b/config_host.mk.in
index eaf0d61..605d701 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -482,7 +482,6 @@ export PYTHON_LIBS=@PYTHON_LIBS@
export RANLIB=@RANLIB@
export REDLAND_CFLAGS=@REDLAND_CFLAGS@
export REDLAND_LIBS=@REDLAND_LIBS@
-export REBASE=@REBASE@
export RHINO_JAR=@RHINO_JAR@
export RHINO_TARBALL=@RHINO_TARBALL@
export RPM=@RPM@
diff --git a/configure.in b/configure.in
index 859152a..5d37a66 100644
--- a/configure.in
+++ b/configure.in
@@ -9144,17 +9144,6 @@ AC_SUBST(WINDOWS_SDK_HOME)
AC_SUBST(WINDOWS_SDK_VERSION)
dnl =========================================
-dnl Check for Micorosft rebase.exe
-dnl =========================================
-if test "$build_os" = "cygwin"; then
- AC_PATH_PROG([REBASE], [rebase])
- if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a "$WINDOWS_SDK_VERSION" = "80"; then
- REBASE=download
- AC_SUBST(REBASE)
- fi
-fi
-
-dnl =========================================
dnl Check for uuidgen
dnl =========================================
if test "$_os" = "WINNT" -a "$cross_compiling" != "yes"; then
diff --git a/download b/download
index fd9bb4a..918852b 100755
--- a/download
+++ b/download
@@ -182,11 +182,6 @@ if [ "$COM" = "MSC" ]; then
downloaditem "http://download.microsoft.com/download/E/9/F/E9FCA9E9-9908-4D8F-B491-8E8A4C294C01/" "WindowsXP-KB958911-x86-ENU.exe" "ff084c5815b0672d54628158b820f5b1"
fi
-if [ "$REBASE" = "download" ]; then
- downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "cab1.cab" "15331cc5cb4a03e7a44aaa303e34bf5b"
- downloaditem "http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/setup/WinSDKTools/" "WinSDKTools_x86.msi" "d1f44ddc2ba6bbda79407e951e44303b"
-fi
-
if [ -f $start_dir/sources.ver -a ! -d $start_dir/.git ] ; then
# these sources are from a tarball, so get the other source tarballs
. $start_dir/sources.ver
@@ -222,17 +217,14 @@ if [ "$COM" = "MSC" -a -n "$md5sum" ]; then
if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ]; then
cp $TARFILE_LOCATION/13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll ./external/dbghelp/dbghelp.dll
fi
- if [ "$REBASE" = "download" ]; then
- if [ ! -f ./external/rebase/rebase.exe -a -f $TARFILE_LOCATION/WinSDKTools_x86.msi ]; then
- msiexec /a `cygpath -d $TARFILE_LOCATION/WinSDKTools_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1
- rebase_exe_path=Pfiles/*/Windows/v7.1/Bin/ReBase.Exe
- sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$rebase_exe_path | sed "s/ .*//"`
- if [ "$sum" = "5892a62147b7be59f0553ae3634e9dfa" ]; then
- cp $TARFILE_LOCATION/tmp/$rebase_exe_path ./external/rebase/rebase.exe
- fi
- fi
- fi
-
+ if [ ! -f ./external/dbghelp/dbghelp.dll -a -f $TARFILE_LOCATION/dbg_x86.msi ]; then
+ msiexec /a `cygpath -d $TARFILE_LOCATION/dbg_x86.msi` /qn TARGETDIR=$TMPUNPACK SHORTFILENAMES=1
+ dbghelp_dll_path=PFiles/DbgTools/dbghelp.dll
+ sum=`$md5sum $md5special $TARFILE_LOCATION/tmp/$dbghelp_dll_path | sed "s/ .*//"`
+ if [ "$sum" = "4003e34416ebd25e4c115d49dc15e1a7" ]; then
+ cp $TARFILE_LOCATION/tmp/$dbghelp_dll_path ./external/dbghelp/dbghelp.dll
+ fi
+ fi
if [ ! -f ./external/gdiplus/gdiplus.dll -a -f $TARFILE_LOCATION/WindowsXP-KB958911-x86-ENU.exe ]; then
gdiplus_dll_path=SP3QFE/asms/10/msft/windows/gdiplus/gdiplus.dll
chmod +x `cygpath $TARFILE_LOCATION`/WindowsXP-KB958911-x86-ENU.exe
diff --git a/external/prj/d.lst b/external/prj/d.lst
index 0577f7f..645fe4a 100644
--- a/external/prj/d.lst
+++ b/external/prj/d.lst
@@ -28,8 +28,6 @@ mkdir: %_DEST%\inc\external\wine
..\dbghelp\dbghelp.dll %_DEST%\bin\dbghelp.dll
-..\rebase\rebase.exe %_DEST%\bin\rebase.exe
-
..\gdiplus\gdiplus.dll %_DEST%\bin\gdiplus.dll
..\msvcp80\msvcm80*.dll %_DEST%\bin
diff --git a/external/rebase/README_rebase.exe b/external/rebase/README_rebase.exe
deleted file mode 100755
index 8724893..0000000
--- a/external/rebase/README_rebase.exe
+++ /dev/null
@@ -1 +0,0 @@
-Put rebase.exe in this directory for Windows builds.
commit b120689ab0eddfd0e1c5d7be74d6acf2ce0181c9
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 9 10:37:23 2012 +0200
Revert "use downloaded rebase.exe with Win8 SDK"
This reverts commit e994a91060c145ad08ef75dcf9862043202ac6ce.
diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl
index f5e5ce0..546068e 100644
--- a/postprocess/rebase/rebase.pl
+++ b/postprocess/rebase/rebase.pl
@@ -179,13 +179,7 @@ sub rebase_again
my $newfiles_ref = shift;
my @grownfiles;
my $solarbin ="$ENV{SOLARVERSION}/$ENV{INPATH}/bin$ENV{UPDMINOREXT}";
- my $command;
- if ( $ENV{REBASE} eq "download" ) {
- $command = $ENV{OUTDIR}."/bin/rebase " . $options_string;
- }
- else {
- $command = "rebase " . $options_string;
- }
+ my $command = "rebase " . $options_string;
if ( $ENV{WRAPCMD} ) {
$command = $ENV{WRAPCMD} . " " . $command;
}
@@ -247,13 +241,7 @@ sub rebase_again
sub rebase_initially
{
my ($files_ref, $start_address) = @_;
- my $command;
- if ( $ENV{REBASE} eq "download" ) {
- $command = $ENV{OUTDIR}."/bin/rebase " . $options_string;
- }
- else {
- $command = "rebase " . $options_string;
- }
+ my $command = "rebase ";
if ( $ENV{WRAPCMD} ) {
$command = $ENV{WRAPCMD} . " " . $command;
}
commit bf467badca422346778e23165e58ab4b7c8d6ab1
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Oct 9 10:36:11 2012 +0200
Revert "download rebase if needed for all sdk versions"
This reverts commit b23f3e484273ed44c36a0c039454cdfbf6f6f1e7.
Conflicts:
configure.in
Change-Id: Id9d3c2373e32bab76d58a7765ea17994b738d309
diff --git a/configure.in b/configure.in
index 4c55537..859152a 100644
--- a/configure.in
+++ b/configure.in
@@ -9147,8 +9147,8 @@ dnl =========================================
dnl Check for Micorosft rebase.exe
dnl =========================================
if test "$build_os" = "cygwin"; then
- AC_PATH_PROG([REBASE], [rebase])
- if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \); then
+ AC_PATH_PROG([REBASE], [rebase])
+ if test \( -z "$REBASE" -o "$REBASE" = "/usr/bin/rebase" \) -a "$WINDOWS_SDK_VERSION" = "80"; then
REBASE=download
AC_SUBST(REBASE)
fi
More information about the Libreoffice-commits
mailing list