feature/gbuild_scp2 is ready for review

Hi all,

I have finished conversion of module scp2 to gbuild. For the
uninitiated: scp2 contains configuration for the installer (or the
biggest part of it, at least, because one configuration format is just
not enough...), i.e., it defines what dirs, files and whatnot are part
of the installation sets. I tested it with several configurations on
Linux and MinGw, but I would appreciate if people tried it with their
configurations.

http://dtardon.fedorapeople.org/libreoffice/test-conversion.sh is a
script that can be used for verification that the install scripts
created by the old and new way are equivalent (if they are, it is quite
probable they will create the same installation :-). The easiest way to
use it is

./autogen.sh <possibly-some-arguments>
./test-conversion.sh -b

This will do everything: check out a commit just before the conversion,
build everything up to scp2, check out head of the branch, build scp2
and compare the results.

Note that it is probable that setup_osl.ins (or .inf on Windows) scripts
will differ slightly. In that case you should use the suggested diff
line to check that the difference is only in reordering of items in a list.

D.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

1/ I'm having breakage building the first side fo things... do you
require a make clean before running your script ?

2/ your script does not seems to detect a build failure... it then
switch on the feature branch and I get

Previous HEAD position was 5875f18... make the output more predictable
Switched to a new branch 'feature/gbuild_scp2'
Branch feature/gbuild_scp2 set up to track remote branch
feature/gbuild_scp2 from origin.
********************************************************************
*
*   Running the post download checks.
*
********************************************************************
checking build system type... i386-apple-darwin10.8.0
checking host system type... i386-apple-darwin10.8.0
cd icu && unset MAKEFLAGS && /Volumes/TBRAM/core/solenv/bin/build.pl -P8 -- -P8


=============
(1/1) Building module icu
=============
Entering /Volumes/TBRAM/core/icu


Multiprocessing build is finished
Maximal number of processes run: 1
cd icu && /Volumes/TBRAM/core/solenv/bin/deliver.pl
Use of uninitialized value $field_a[0] in numeric lt (<) at
/Volumes/TBRAM/core/solenv/bin/deliver.pl line 849.
Use of uninitialized value $field_a[0] in numeric lt (<) at
/Volumes/TBRAM/core/solenv/bin/deliver.pl line 849.
Use of uninitialized value $field_a[0] in numeric lt (<) at
/Volumes/TBRAM/core/solenv/bin/deliver.pl line 849.
Use of uninitialized value $field_a[0] in numeric lt (<) at
/Volumes/TBRAM/core/solenv/bin/deliver.pl line 849.
Use of uninitialized value $field_a[0] in numeric lt (<) at
/Volumes/TBRAM/core/solenv/bin/deliver.pl line 849.
Module 'icu' delivered successfully. 1 files copied, 265 files unchanged
cd scp2 && /opt/lo/bin/make -j 8 -rs gb_PARTIALBUILD=T
/Volumes/TBRAM/core/solver/unxmacxi.pro/inc/pyversion.mk:8: ***
missing separator.  Stop.
make: *** [scp2] Error 2
cannot find new build of scp2

I'm trying again starting with a make clean...

Norbert
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

so, building after a make clean yield:
[....]
Multiprocessing build is finished
Maximal number of processes run: 8
Previous HEAD position was 5875f18... make the output more predictable
Switched to branch 'feature/gbuild_scp2'
********************************************************************
*
*   Running the post download checks.
*
********************************************************************
checking build system type... i386-apple-darwin10.8.0
checking host system type... i386-apple-darwin10.8.0
cd icu && unset MAKEFLAGS && /Volumes/TBRAM/core/solenv/bin/build.pl -P8 -- -P8


=============
(1/1) Building module icu
=============
Entering /Volumes/TBRAM/core/icu


Multiprocessing build is finished
Maximal number of processes run: 1
cd icu && /Volumes/TBRAM/core/solenv/bin/deliver.pl
Module 'icu' delivered successfully. 1 files copied, 260 files unchanged
cd scp2 && /opt/lo/bin/make -j 8 -rs gb_PARTIALBUILD=T
/Volumes/TBRAM/core/solver/unxmacxi.pro/inc/pyversion.mk:8: ***
missing separator.  Stop.
make: *** [scp2] Error 2
cannot find new build of scp2


Note: pyversion.mk looks like
cat solver/unxmacxi.pro/inc/pyversion.mk
# when you want to change the python version, you must update the d.lst
# in the python project accordingly !!!
PYMAJOR=2
PYMINOR=6
PYMICRO=1
PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)

.IF "$(GUI)" == "UNX"
.IF "$(OS)" == "MACOSX"
PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).a
PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython
CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR)
.ELSE
PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
.ENDIF
.ELSE
.IF "$(COM)" == "GCC"
PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll
PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
.ELSE
PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll
PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib
.ENDIF
.ENDIF

which is very much dmake like

yet it is used in InstallModule_python.mk

ifeq ($(DISABLE_PYTHON),TRUE)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
        -DDISABLE_PYUNO \
))
else ifeq ($(SYSTEM_PYTHON),YES)
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
        -DSYSTEM_PYTHON \
))
else
include $(OUTDIR)/inc/pyversion.mk
^^^^^ that cannot work with a dmake makefile, especially with
conditional in it !

$(eval $(call gb_InstallModule_add_defs,scp2/python,\
        -DPYVERSION=$(PYVERSION) \
        -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
        -DPY_FULL_DLL_NAME=$(PY_FULL_DLL_NAME) \
))
endif


The attached patch solved that problem for me.
(with a modification of your script to re-build + deliver python when needed)

after that I get
[ build SPP ] scp2/source/ooo/ooo_brand
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:707
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:707
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:707 Bad
token ..) produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:718
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:718
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:718 Bad
token ..) produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:729
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:729
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:729 Bad
token ..) produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:740
Bad token ..## produced by ##
cpp: <macro>:1 /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:740
## occurs at border of replacement
cpp: /Volumes/TBRAM/core/scp2/source/ooo/file_library_ooo.scp:740 Bad
token ..) produced by ##
make[1]: *** [/Volumes/TBRAM/core/workdir/unxmacxi.pro/ScpPreprocessTarget/scp2/source/ooo/file_library_ooo.pre]
Error 1
make[1]: *** Deleting file
`/Volumes/TBRAM/core/workdir/unxmacxi.pro/ScpPreprocessTarget/scp2/source/ooo/file_library_ooo.pre'
make[1]: *** Waiting for unfinished jobs....
make: *** [scp2] Error 2
cannot find new build of scp2

I got past that one with
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 81653a0..79bb780 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -177,7 +177,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 ))
 endif

-ifneq ($(SYSTEM_LIBXSLT),YES)
+ifneq ($(SYSTEM_ICU),YES)
 include $(OUTDIR)/inc/icuversion.mk
 endif


Then I get:

[ build IMO ] scp2/ooo
************************************************
WARNING: multiple assignments of gids:
************************************************
                GID: gid_Brand_Dir_Program Assignments: 2
[ build MOD ] scp2
[ build ALL ] top level modules: scp2
[ build ALL ] loaded modules: scp2


These par files only exist in old build:
registryitem_binfilter.par
par test failed: skipping ins test

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

BTW to get the thing moving forward as described above I needed:

--- test-conversion.sh.orig 2012-05-20 09:07:36.000000000 -0500
+++ test-conversion.sh 2012-05-20 09:20:28.000000000 -0500
@@ -111,12 +111,19 @@

 do_build() {
     local system_icu=$(get_make_var SYSTEM_ICU)
+    local system_python=$(get_make_var SYSTEM_PYTHON)
     git checkout 5875f18b71c6734145aca9c3210b7de444966a29
     make scp2.all
     git checkout feature/gbuild_scp2
     if [[ ${system_icu} != YES ]]; then
+        make icu.clean
         make icu icu.deliver
     fi
+    if [[ ${system_python} = NO ]]; then
+        make python.clean
+        make python
+        make python.deliver
+    fi
     make scp2
 }
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

ok, after some back and forth the result, on Mac, is:

--- /Volumes/TBRAM/core/scp2/unxmacxi.pro/bin/osl/setup_osl.ins 2012-05-20
14:03:04.000000000 -0500
+++ /Volumes/TBRAM/core/workdir/unxmacxi.pro/InstallScriptTarget/setup_osl.ins 2012-05-20
14:05:04.000000000 -0500
@@ -19955,70 +19955,70 @@
  Description (zh-TW) = "%PRODUCTNAME %PRODUCTVERSION";
  Description (zu) = "%PRODUCTNAME %PRODUCTVERSION";
  Dirs = (gid_Dir_Share_Template_Wizard_Letter,gid_Dir_Download,gid_Dir_User_Template,gid_Dir_Samples_Databases_Dateien,
- gid_Brand_Dir_Share_Extensions_Dict_Te,gid_Dir_Bookmark_Internet,gid_Dir_Share_Icons,
+ gid_Dir_Bookmark_Internet,gid_Brand_Dir_Share_Extensions_Dict_Te,gid_Dir_Share_Icons,
  gid_Dir_Bundle_Contents_Library_Spotlight_Bundle,gid_Dir_User_Uno_Packages_Cache,
- gid_Dir_Fonts,gid_Brand_Dir_Share_Extensions_Dict_Pl,gid_Brand_Dir_Share_Extensions_Dict_Zu,
- gid_Dir_Template_Common_Educate,gid_Dir_Gallery_Wwwgraf,gid_Dir_Basic_Template,gid_Brand_Dir_Share_Extensions_MediaWiki,
- gid_Dir_Gallery_Surface,gid_Dir_User_Psprint_Driver,gid_Brand_Dir_Share_Extensions_Dict_Ca,
- gid_Dir_Template_Wizard_Fax,gid_Dir_Share_Config_Sofficecfg_Dbquery_Menubar,gid_Dir_Basic_Scriptbindinglib,
- gid_Dir_Share_Config_Sofficecfg_Sdraw_Menubar,gid_Dir_Share_Xslt_Import_Wordml,gid_Dir_Fonts_Truetype,
- gid_Dir_User_Config_Sofficecfg_Bitmaps,gid_Dir_Share_Config_Sofficecfg_Dbtable,gid_Dir_Gallery_Finances,
- gid_Dir_Gallery_Sounds,gid_Dir_Share_Dtd,gid_Dir_Template_Language,gid_Dir_Share_Xslt_Import_Spreadsheetml,
- gid_Brand_Dir_Share_Extensions_Presenter_Screen,gid_Dir_Store_Trash,gid_Dir_User_Xslt,
- gid_Brand_Dir_Share_Extensions_Dict_Si,gid_Brand_Dir_Share_Extensions_Dict_Et,gid_Dir_Template_Internal,
- gid_Dir_Share_Xslt_Export_Wordml,gid_Brand_Dir_Share_Extensions_Dict_Af,gid_Dir_Basic_Formwiz,
- gid_Dir_Samples_Presentations,gid_Dir_Basic_Standard,gid_Dir_Samples_Texts,gid_Dir_Gallery_Emoticons,
- gid_Brand_Dir_Share_Extensions_Dict_En,gid_Dir_Share_Autocorr,gid_Dir_Database,gid_Dir_Backup,
- gid_Dir_Gallery_Computer,gid_Dir_Fonts_Truetypeserver,gid_Dir_Share_Config_Sofficecfg_Startmodule,
- gid_Dir_User_Cache,gid_Dir_Share_Fingerprint,gid_Dir_Template_Forms,gid_Dir_Share_Config_Sofficecfg_Dbbrowser_Menubar,
- gid_Dir_Template_Common_Offimisc,gid_Brand_Dir_Share_Extensions_Report_Builder,gid_Dir_Bookmark_Info,
- gid_Dir_Gallery,gid_Brand_Dir_Share_Extensions_Dict_An,gid_Dir_Template_Labels,gid_Dir_Share_Xslt_Docbook,
+ gid_Dir_Fonts,gid_Brand_Dir_Share_Extensions_Dict_Pl,gid_Dir_Template_Common_Educate,
+ gid_Brand_Dir_Share_Extensions_Dict_Zu,gid_Dir_Gallery_Wwwgraf,gid_Dir_Basic_Template,
+ gid_Brand_Dir_Share_Extensions_MediaWiki,gid_Dir_Gallery_Surface,gid_Dir_User_Psprint_Driver,
+ gid_Brand_Dir_Share_Extensions_Dict_Ca,gid_Dir_Template_Wizard_Fax,gid_Dir_Share_Config_Sofficecfg_Dbquery_Menubar,
+ gid_Dir_Basic_Scriptbindinglib,gid_Dir_Share_Config_Sofficecfg_Sdraw_Menubar,gid_Dir_Share_Xslt_Import_Wordml,
+ gid_Dir_Fonts_Truetype,gid_Dir_User_Config_Sofficecfg_Bitmaps,gid_Dir_Share_Config_Sofficecfg_Dbtable,
+ gid_Dir_Gallery_Finances,gid_Dir_Gallery_Sounds,gid_Dir_Share_Dtd,gid_Dir_Template_Language,
+ gid_Dir_Share_Xslt_Import_Spreadsheetml,gid_Brand_Dir_Share_Extensions_Presenter_Screen,
+ gid_Dir_Store_Trash,gid_Dir_User_Xslt,gid_Brand_Dir_Share_Extensions_Dict_Si,gid_Brand_Dir_Share_Extensions_Dict_Et,
+ gid_Dir_Template_Internal,gid_Dir_Share_Xslt_Export_Wordml,gid_Dir_Basic_Formwiz,
+ gid_Brand_Dir_Share_Extensions_Dict_Af,gid_Dir_Samples_Presentations,gid_Dir_Basic_Standard,
+ gid_Dir_Samples_Texts,gid_Dir_Gallery_Emoticons,gid_Brand_Dir_Share_Extensions_Dict_En,
+ gid_Dir_Share_Autocorr,gid_Dir_Database,gid_Dir_Backup,gid_Dir_Gallery_Computer,gid_Dir_Fonts_Truetypeserver,
+ gid_Dir_Share_Config_Sofficecfg_Startmodule,gid_Dir_User_Cache,gid_Dir_Share_Fingerprint,
+ gid_Dir_Template_Forms,gid_Dir_Share_Config_Sofficecfg_Dbbrowser_Menubar,gid_Dir_Template_Common_Offimisc,
+ gid_Brand_Dir_Share_Extensions_Report_Builder,gid_Dir_Bookmark_Info,gid_Dir_Gallery,
+ gid_Brand_Dir_Share_Extensions_Dict_An,gid_Dir_Template_Labels,gid_Dir_Share_Xslt_Docbook,
  gid_Dir_Share_Config_Sofficecfg_Scalc,gid_Dir_Share_Xslt_Export_Common_Body,gid_Dir_Template_Common_Labels,
  gid_Dir_Wordbook,gid_Dir_Share_Config_Sofficecfg_Basicide_Menubar,gid_Dir_Share_Config_Sofficecfg_Smath,
  gid_Dir_User_Psprint_Fontmetric,gid_Dir_User_Autotext,gid_Dir_Samples_Drawings,gid_Dir_Share_Pqa,
  gid_Dir_Config_Webcast,gid_Brand_Dir_Share_Extensions_Dict_Gl,gid_Dir_Share_Config_Sofficecfg_Dbapp,
  gid_Dir_Share_Xslt_Import_uof,gid_Brand_Dir_Share_Extensions_Dict_Gd,gid_Dir_Template_Common_Officorr,
- gid_Dir_Template_Wizard,gid_Brand_Dir_Share_Extensions_Dict_Fr,gid_Dir_Help,gid_Dir_Template_Educate,
+ gid_Dir_Template_Wizard,gid_Dir_Help,gid_Dir_Template_Educate,gid_Brand_Dir_Share_Extensions_Dict_Fr,
  gid_Dir_Template_Common,gid_Dir_Share_Config_Wizard_Web_Buttons,gid_Dir_Samples_Documentations,
  gid_Dir_Wizards_Document,gid_Brand_Dir_Share_Extensions_Dict_Sl,gid_Brand_Dir_Share_Extensions_Dict_Lt,
  gid_Dir_Template_Common_Misc,gid_Brand_Dir_Share_Extensions_Dict_Hi,gid_Dir_Config_More,
  gid_Dir_Samples_Texts_Kapitel,gid_Dir_Samples_Formulas,gid_Dir_Basic_Schedule,gid_Dir_Bookmark_Language,
- gid_Dir_Database_Biblio,gid_Dir_Template_Wizard_Agenda,gid_Dir_Share_Dtd_Math_1_01,
- gid_Dir_Basic_Tools,gid_Dir_Gallery_Balloons,gid_Brand_Dir_Share_Extensions_Dict_Nl,
- gid_Dir_Bookmark_Starone,gid_Brand_Dir_Share_Extensions_Dict_Es,gid_Dir_Template_Wizard_Report,
- gid_Dir_Gallery_Photos_Flowers,gid_Brand_Dir_Share_Extensions_Dict_Uk,gid_Dir_Share_Scripts,
- gid_Dir_Share_Config_Sofficecfg_Schart_Menubar,gid_Dir_Gallery_Flags,gid_Dir_Share_Migration,
- gid_Brand_Dir_Share_Extensions_Dict_Da,gid_Dir_Share_Dtd_Ooo_1_0,gid_Dir_User_Bookmark,
- gid_Dir_Gallery_Calendar,gid_Dir_Autotext_Language,gid_Dir_Template_Common_Layout,
- gid_Dir_Share_Config_Wizard,gid_Dir_Share_Config_Sofficecfg_Sbibliography_Menubar,
- gid_Dir_Addin_Source,gid_Dir_Basic_Depot,gid_Dir_Gallery_Photos_Buildings,gid_Dir_Gallery_Photos_Space,
- gid_Dir_Share_Database,gid_Dir_User_Config,gid_Brand_Dir_Share_Extensions_Dict_Hu,
+ gid_Dir_Database_Biblio,gid_Dir_Template_Wizard_Agenda,gid_Dir_Basic_Tools,gid_Dir_Share_Dtd_Math_1_01,
+ gid_Dir_Gallery_Balloons,gid_Brand_Dir_Share_Extensions_Dict_Nl,gid_Dir_Bookmark_Starone,
+ gid_Brand_Dir_Share_Extensions_Dict_Es,gid_Dir_Template_Wizard_Report,gid_Dir_Gallery_Photos_Flowers,
+ gid_Brand_Dir_Share_Extensions_Dict_Uk,gid_Dir_Share_Scripts,gid_Dir_Share_Config_Sofficecfg_Schart_Menubar,
+ gid_Dir_Gallery_Flags,gid_Dir_Share_Migration,gid_Brand_Dir_Share_Extensions_Dict_Da,
+ gid_Dir_Share_Dtd_Ooo_1_0,gid_Dir_User_Bookmark,gid_Dir_Gallery_Calendar,gid_Dir_Autotext_Language,
+ gid_Dir_Template_Common_Layout,gid_Dir_Share_Config_Sofficecfg_Sbibliography_Menubar,
+ gid_Dir_Share_Config_Wizard,gid_Dir_Basic_Depot,gid_Dir_Addin_Source,gid_Dir_Gallery_Photos_Buildings,
+ gid_Dir_Gallery_Photos_Space,gid_Dir_Share_Database,gid_Dir_User_Config,gid_Brand_Dir_Share_Extensions_Dict_Hu,
  gid_Dir_Gallery_Trouble,gid_Dir_Gallery_Officeart,gid_Dir_Template_Wizard_Letter,
  gid_Dir_User_Psprint,gid_Dir_Help_Isolanguage,gid_Dir_Gallery_Education,gid_Dir_Basic,
  gid_Brand_Dir_Share_Extensions_Dict_Pt,gid_Brand_Dir_Share_Extensions_Dict_Vi,gid_Dir_Gallery_Screenbeans,
- gid_Dir_Basic_Gimmicks,gid_Brand_Dir_Share_Extensions_Dict_Ne,gid_Dir_Share_Config_Sofficecfg_Basicide,
- gid_Dir_Share_Config_Help,gid_Dir_Bundle_Contents_Library_Spotlight,gid_Dir_Share_Plugin,
- gid_Brand_Dir_Share_Extensions_Dict_Ar,gid_Dir_Gallery_Photos_Humans,gid_Dir_Template_Wizard_Styles,
- gid_Dir_Wizards_Common,gid_Dir_Gallery_Wwwanim,gid_Dir_Share_Xslt_Export,gid_Dir_Share_Config_Sofficecfg_Dbtable_Menubar,
- gid_Dir_Share_Registry_Res,gid_Dir_Gallery_Photos_Landscapes,gid_Dir_Gallery_Clipart,
- gid_Dir_Work,gid_Dir_User_Autotext_Language,gid_Dir_Share_Template_Wizard,gid_Dir_Share_Xslt_Export_Xhtml,
- gid_Dir_Share_Config_Sofficecfg_Simpress,gid_Dir_Gallery_Photos_Travel,gid_Dir_Bookmark_Java,
- gid_Dir_Classes,gid_Dir_Addin,gid_Dir_User_Scripts,gid_Brand_Dir_Share_Extensions_Dict_Cs,
- gid_Dir_Gallery_Bullets,gid_Brand_Dir_Share_Extensions_Dict_Oc,gid_Dir_Palmpilot,
+ gid_Dir_Basic_Gimmicks,gid_Brand_Dir_Share_Extensions_Dict_Ne,gid_Dir_Share_Config_Help,
+ gid_Dir_Share_Config_Sofficecfg_Basicide,gid_Dir_Bundle_Contents_Library_Spotlight,
+ gid_Dir_Share_Plugin,gid_Brand_Dir_Share_Extensions_Dict_Ar,gid_Dir_Gallery_Photos_Humans,
+ gid_Dir_Template_Wizard_Styles,gid_Dir_Wizards_Common,gid_Dir_Gallery_Wwwanim,gid_Dir_Share_Registry_Res,
+ gid_Dir_Share_Config_Sofficecfg_Dbtable_Menubar,gid_Dir_Share_Xslt_Export,gid_Dir_Gallery_Photos_Landscapes,
+ gid_Dir_Gallery_Clipart,gid_Dir_User_Autotext_Language,gid_Dir_Work,gid_Dir_Share_Template_Wizard,
+ gid_Dir_Share_Xslt_Export_Xhtml,gid_Dir_Share_Config_Sofficecfg_Simpress,gid_Dir_Gallery_Photos_Travel,
+ gid_Dir_Bookmark_Java,gid_Dir_Classes,gid_Dir_Addin,gid_Dir_User_Scripts,gid_Brand_Dir_Share_Extensions_Dict_Cs,
+ gid_Dir_Gallery_Bullets,gid_Dir_Palmpilot,gid_Brand_Dir_Share_Extensions_Dict_Oc,
  gid_Brand_Dir_Share_Extensions_Dict_Sk,gid_Dir_Gallery_Communic,gid_Dir_Gallery_Wwwback,
  gid_Dir_Share_Config_Sofficecfg_Sglobal,gid_Dir_User_Uno_Packages,gid_Dir_User_Config_Sofficecfg_Metainf,
  gid_Dir_Template_Wizard_Web,gid_Dir_Gallery_Photos_Cities,gid_Dir_Store,gid_Dir_Gallery_Clima,
  gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr,gid_Brand_Dir_Share_Extensions_Dict_El,
- gid_Dir_Wizards_Ui_Event,gid_Dir_Autotext,gid_Dir_Filter,gid_Dir_Template_Common_Forms,
+ gid_Dir_Wizards_Ui_Event,gid_Dir_Autotext,gid_Dir_Template_Common_Forms,gid_Dir_Filter,
  gid_Brand_Dir_Share_Extensions_Dict_He,gid_Dir_Share_Config_Wizard_Web,gid_Dir_Share_Config_Sofficecfg_Sweb_Menubar,
  gid_Dir_Bundle_Contents_Resources_Lang,gid_Dir_Share_Xslt,gid_Dir_Share_Config_Sofficecfg_Sglobal_Menubar,
  gid_Brand_Dir_Share_Extensions_Presentation_Minimizer,gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages,
  gid_Brand_Dir_Share_Extensions_Dict_Sr,gid_Dir_Gallery_Navi_2d,gid_Brand_Dir_Share_Extensions_Dict_Ro,
- gid_Dir_Gallery_Arrows,gid_Dir_UreLink,gid_Dir_User_Gallery,gid_Dir_Share_Dict,gid_Dir_Desktop,
- gid_Dir_Bookmark_Tourismus,gid_Brand_Dir_Program_Types,gid_Dir_Share_Config_Sofficecfg_Sbibliography,
- gid_Dir_Bundle_Contents_Library,gid_Dir_Template_Common_Presnt,gid_Brand_Dir_Share_Extensions_Dict_Ru,
+ gid_Dir_Gallery_Arrows,gid_Dir_UreLink,gid_Dir_User_Gallery,gid_Dir_Share_Dict,gid_Dir_Bookmark_Tourismus,
+ gid_Dir_Desktop,gid_Brand_Dir_Program_Types,gid_Dir_Share_Config_Sofficecfg_Sbibliography,
+ gid_Dir_Template_Common_Presnt,gid_Dir_Bundle_Contents_Library,gid_Brand_Dir_Share_Extensions_Dict_Ru,
  gid_Dir_Share_Config_Sofficecfg_Simpress_Menubar,gid_Dir_Template_Presnt,gid_Dir_Share_Xslt_Export_Spreadsheetml,
- gid_Brand_Dir_Share_Extensions_Dict_No,gid_Dir_Gallery_Rulers,gid_Dir_Gallery_Photos_Fauna,
+ gid_Dir_Gallery_Photos_Fauna,gid_Brand_Dir_Share_Extensions_Dict_No,gid_Dir_Gallery_Rulers,
  gid_Dir_Gallery_Draws,gid_Dir_User_Explorer,gid_Dir_Share_Database_Language,gid_Dir_Template_Officorr,
  gid_Brand_Dir_Share_Extensions_PDF_Import,gid_Dir_Wizards_Text,gid_Dir_Bundle_Contents_Library_Spotlight_Bundle_Contents,
  gid_Dir_Share_Xslt_Export_Common_Styles,gid_Brand_Dir_Program_Services,gid_Dir_User_Temp,
@@ -20034,24 +20034,24 @@
  gid_Brand_Dir_Share_Extensions_Dict_Lv,gid_Brand_Dir_Share_Extensions_Dict_Hr,gid_Dir_Share_Config_Sofficecfg_Dbapp_Menubar,
  gid_Dir_Config_Language,gid_Dir_Config_Start,gid_Brand_Dir_Share_Extensions_Dict_Br,
  gid_Dir_Gallery_People,gid_Dir_Template_Common_Personal,gid_Dir_Share_Xslt_Export_Common_Table,
- gid_Dir_Share_Config_Sofficecfg,gid_Dir_Share_Config_Sofficecfg_Dbbrowser,gid_Dir_Share_Config_Sofficecfg_Schart,
- gid_Dir_Samples,gid_Dir_Fonts_75dpi,gid_Brand_Dir_Share_Extensions_Dict_It,gid_Dir_Bookmark,
- gid_Dir_Share_Config_Sofficecfg_Dbquery,gid_Dir_Share_Config_Sofficecfg_Swriter,gid_Brand_Dir_Share_Extensions_Dict_Be,
- gid_Dir_Config_Tasks,gid_Dir_Wizards_Ui,gid_Dir_Samples_Advertisement,gid_Dir_User,
- gid_Dir_Share_Config_Sofficecfg_Dbrelation,gid_Dir_Gallery_Photos_Celebration,gid_Dir_Samples_Databases,
- gid_Dir_Psprint_Fontmetric,gid_Dir_Resource,gid_Dir_Gallery_Draws_People,gid_Brand_Dir_Share_Extensions_Dict_De,
- gid_Dir_User_Wordbook,gid_Dir_Explorer,gid_Dir_Gallery_Photos_FoodsandDrinks,gid_Dir_Bookmark_Freizeit,
- gid_Dir_Share_Template_Wizard_Bitmap,gid_Dir_Template_Misc,gid_Dir_Psprint_Driver,
- gid_Dir_Template_Layout,gid_Dir_Share_Config_Sofficecfg_Sdraw,gid_Dir_Gallery_Photos_Statues,
- gid_Dir_Gallery_Photos,gid_Dir_Config_Settings,gid_Dir_Share_Config_Sofficecfg_Startmodule_Menubar,
- gid_Dir_Gallery_Time,gid_Dir_Template_Personal,gid_Dir_Share_Dtd_Math,gid_Dir_Plugin,
- gid_Dir_Bundle,gid_Dir_Template_Offimisc,gid_Dir_Share_Config_Sofficecfg_Swriter_Menubar,
- gid_Dir_Wizards,gid_Dir_Gallery_Photo,gid_Dir_Template_Common_Finance,gid_Dir_Gallery_Photos_Objects,
- gid_Brand_Dir_Share_Extensions_Dict_Sw,gid_Brand_Dir_Share_Extensions_Dict_Gu,gid_Dir_Psprint,
- gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt,gid_Dir_Share_Xslt_Import_Common,gid_Brand_Dir_Share_Extensions_Oooimprovement,
- gid_Dir_Basic_Euro,gid_Dir_Share_Xslt_Common,gid_Dir_Gallery_Photos_Plants,gid_Dir_Gallery_Elements,
- gid_Dir_Basic_Tutorials,gid_Dir_User_Autocorr,gid_Brand_Dir_Share_Extensions_Dict_Bg,
- gid_Dir_User_Basic,gid_Dir_Samples_Spreadsheets);
+ gid_Dir_Share_Config_Sofficecfg,gid_Dir_Share_Config_Sofficecfg_Dbbrowser,gid_Dir_Samples,
+ gid_Dir_Share_Config_Sofficecfg_Schart,gid_Dir_Fonts_75dpi,gid_Brand_Dir_Share_Extensions_Dict_It,
+ gid_Dir_Bookmark,gid_Dir_Share_Config_Sofficecfg_Dbquery,gid_Dir_Share_Config_Sofficecfg_Swriter,
+ gid_Brand_Dir_Share_Extensions_Dict_Be,gid_Dir_Config_Tasks,gid_Dir_Samples_Advertisement,
+ gid_Dir_Wizards_Ui,gid_Dir_User,gid_Dir_Gallery_Photos_Celebration,gid_Dir_Share_Config_Sofficecfg_Dbrelation,
+ gid_Dir_Psprint_Fontmetric,gid_Dir_Samples_Databases,gid_Dir_Gallery_Draws_People,
+ gid_Dir_Resource,gid_Brand_Dir_Share_Extensions_Dict_De,gid_Dir_User_Wordbook,gid_Dir_Explorer,
+ gid_Dir_Gallery_Photos_FoodsandDrinks,gid_Dir_Bookmark_Freizeit,gid_Dir_Share_Template_Wizard_Bitmap,
+ gid_Dir_Template_Misc,gid_Dir_Psprint_Driver,gid_Dir_Template_Layout,gid_Dir_Gallery_Photos_Statues,
+ gid_Dir_Share_Config_Sofficecfg_Sdraw,gid_Dir_Gallery_Photos,gid_Dir_Config_Settings,
+ gid_Dir_Share_Config_Sofficecfg_Startmodule_Menubar,gid_Dir_Gallery_Time,gid_Dir_Template_Personal,
+ gid_Dir_Share_Dtd_Math,gid_Dir_Plugin,gid_Dir_Bundle,gid_Dir_Template_Offimisc,gid_Dir_Wizards,
+ gid_Dir_Share_Config_Sofficecfg_Swriter_Menubar,gid_Dir_Template_Common_Finance,gid_Dir_Gallery_Photo,
+ gid_Dir_Gallery_Photos_Objects,gid_Brand_Dir_Share_Extensions_Dict_Sw,gid_Brand_Dir_Share_Extensions_Dict_Gu,
+ gid_Dir_Psprint,gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt,gid_Dir_Share_Xslt_Import_Common,
+ gid_Dir_Share_Xslt_Common,gid_Brand_Dir_Share_Extensions_Oooimprovement,gid_Dir_Basic_Euro,
+ gid_Dir_Gallery_Photos_Plants,gid_Dir_Gallery_Elements,gid_Dir_User_Autocorr,gid_Dir_Basic_Tutorials,
+ gid_Brand_Dir_Share_Extensions_Dict_Bg,gid_Dir_Samples_Spreadsheets,gid_Dir_User_Basic);
  Files = (gid_File_Lib_Odbcbase,gid_File_Lib_Vbamsforms,gid_File_Ucpcmis,gid_File_Lib_Rtftok,
  gid_File_Lib_Fps_Aqua,gid_File_Lib_MacOSXSpell,gid_File_Fnt_LinuxLibertineG_Bold,
  gid_File_Lib_Cairo,gid_File_Fnt_GentiumBookBasicBold,gid_File_Fnt_LinuxLibertineG_BoldItalic,


I'll try with the official-release-config later...

Norbert
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

On Sun, May 20, 2012 at 02:08:04PM -0500, Norbert Thiebaud wrote:
> ok, after some back and forth the result, on Mac, is:

Okay, so this simple comparison is useless in practice. I uploaded a new
version of the script that does the comparison in two steps: in first
step it removes the Dirs and Files lists and does a diff of the rest and
in second step it extracts the Dirs and Files lists for all modules,
sorts them and compares them. The output of the second step (if there is
any difference) is in pseudo-diff format.

D.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice