Return-Path: X-Original-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 899B59DA1 for ; Tue, 20 Dec 2011 21:19:06 +0000 (UTC) Received: (qmail 10563 invoked by uid 500); 20 Dec 2011 21:19:06 -0000 Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org Received: (qmail 10499 invoked by uid 500); 20 Dec 2011 21:19:06 -0000 Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-dev@incubator.apache.org Received: (qmail 10483 invoked by uid 99); 20 Dec 2011 21:19:06 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 21:19:06 +0000 Received: from localhost (HELO localhost) (127.0.0.1) (smtp-auth username arielch, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Dec 2011 21:19:06 +0000 Date: Tue, 20 Dec 2011 18:20:48 -0300 From: Ariel Constenla-Haile To: ooo-dev@incubator.apache.org Subject: [CODE] Replace buildid by svn revision, and fix broken --with-build-version Message-ID: <20111220212048.GA22871@localhost> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="EuxKj2iCbKjpUGkD" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) --EuxKj2iCbKjpUGkD Content-Type: multipart/mixed; boundary="vtzGhvizbBRQ85DL" Content-Disposition: inline --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi there, the attached patches are an attempt to replace the build-id by the subversion revision; and fix --with-build-version that didn't work. The svn revision is set in configure (I guess this could have been done somewhere in the perl installer code). It supports both subversion and git-svn repositories. In case of plane=20 sources without repo, the build-id is set to 0. (Tested only with git-svn). With the following configure switches =2E/configure \ --with-build-version=3D"$(date +"%Y-%m-%d %H:%M:%S %z (%a, %d %b %Y)")" \ --enable-verbose \ --enable-category-b \ =2E.. the About Dialog looks like: http://people.apache.org/~arielch/images/AboutDlg.png You can try with this Win build: http://people.apache.org/~arielch/packages/OOo-Dev_OOO340m1_Win_x86_install= -arc_en-US.zip On WinXP the BUILD_VER_STRING looks too small, may be the font size should be increased. Tests and comments/improvements are welcome :) Regards --=20 Ariel Constenla-Haile La Plata, Argentina --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-Change-buildid-to-svn-revision.patch" Content-Transfer-Encoding: quoted-printable =46rom 9b9fd5909d1441c8d4df0f4e7f554d052f22853b Mon Sep 17 00:00:00 2001 =46rom: Ariel Constenla-Haile Date: Tue, 20 Dec 2011 16:41:17 -0300 Subject: [PATCH 1/2] Change buildid to svn revision --- configure.in | 44 ++++++++++++++++++++++++++++++++++++++++++++ set_soenv.in | 4 ++++ solenv/inc/minor.mk | 4 ++-- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index b5b55be..2a9bbcc 100644 --- a/configure.in +++ b/configure.in @@ -2853,6 +2853,50 @@ if test "$with_alloc" =3D "internal" -o -z "$with_al= loc"; then fi AC_SUBST(ALLOC) =20 + +dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +dnl Build revision +dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +AC_MSG_CHECKING([build revision]) + +BUILD_REVISION=3D +_svn_cmd=3D + +if test -d ./.svn; then + for prog in "$SUBVERSION" svn; do + if test -x $prog; then + _svn_cmd=3D$prog + break + fi + done + if test -z _svn_cmd; then + AC_MSG_WARN([subversion repository, but subversion program not fou= nd. Export $$SUBVERSION=3Dpath_to_svn]) + fi +else + for prog in "$GIT" git; do + $prog status >/dev/null 2> /dev/null + if test $? -eq 0; then + _svn_cmd=3D"$prog svn" + break + fi + done +fi + +if test -n "$_svn_cmd"; then + BUILD_REVISION=3D$(echo $($_svn_cmd info) | sed -e 's/^.*Last Changed = Rev: //g' -e 's/ .*//g') + if test -n $BUILD_REVISION; then + AC_MSG_RESULT([$BUILD_REVISION]) + fi +fi + +if test -z $BUILD_REVISION; then + BUILD_REVISION=3D"0" + AC_MSG_RESULT([No source code repository.]) +fi + +AC_SUBST(BUILD_REVISION) + dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D dnl Custom build version dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff --git a/set_soenv.in b/set_soenv.in index 2e32307..2692380 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -917,6 +917,9 @@ $USR_OPENWIN =3D $USR.$ds."openwin"; $USR_DT =3D $USR.$ds."dt"; $COMMON_BUILD_TOOLS =3D '$SRC_ROOT'.$ds."external".$ds."common"; =20 +# allow pro and non-pro +$outfile =3D $outfile.$PROEXT; + # Generate alternate output file for sh? $outfile_sh =3D $outfile.".sh"; =20 @@ -1643,6 +1646,7 @@ ToFile( "MOZILLA_VERSION", $MOZILLA_VERSION, "e" = ); ToFile( "DEFAULT_MOZILLA_TOOLKIT", $MOZILLA_TOOLKIT, "e" ); ToFile( "ENABLE_NSS_MODULE", "@ENABLE_NSS_MODULE@", "e" ); ToFile( "MOZILLABUILD", "@MOZILLABUILD@", "e" ); +ToFile( "BUILD_REVISION", "@BUILD_REVISION@", "e" ); ToFile( "BUILD_VER_STRING", "@BUILD_VER_STRING@", "e" ); if ($platform =3D~ m/linux/ && $platform =3D~ m/powerpc/) { ToFile( "JITC_PROCESSOR_TYPE","6", "e" ); diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index d1734c0..1566e38 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=3D340 -RSCREVISION=3D340m1(Build:9584) -BUILD=3D9584 +RSCREVISION=3D340m1(Build:$(BUILD_REVISION)) +BUILD=3D$(BUILD_REVISION) LAST_MINOR=3Dm1 SOURCEVERSION=3DOOO340 --=20 1.7.7.4 --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-Fix-some-issues-with-BUILD_VER_STRING-on-About-dialo.patch" Content-Transfer-Encoding: quoted-printable =46rom c0e0ce19300990d5e511553c47b55c4b77cb3d1d Mon Sep 17 00:00:00 2001 =46rom: Ariel Constenla-Haile Date: Tue, 20 Dec 2011 16:42:07 -0300 Subject: [PATCH 2/2] Fix some issues with BUILD_VER_STRING on About dialog --- cui/source/dialogs/about.cxx | 16 ++++++++++++---- cui/source/dialogs/makefile.mk | 4 ++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index c733fe0..5a66b64 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -231,7 +231,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId&= rId ) : aBuildData.SetFont( aNewFont ); aBuildData.SetBackground( aWall ); #ifdef BUILD_VER_STRING - String aBuildString( DEFINE_CONST_UNICODE( BUILD_VER_STRING ) ); +#define _STRINGIFY(x) #x +#define STRINGIFY(x) _STRINGIFY(x) + String aBuildString( DEFINE_CONST_UNICODE( STRINGIFY( BUILD_VER_STRING ) = ) ); #else String aBuildString; #endif @@ -250,10 +252,16 @@ AboutDialog::AboutDialog( Window* pParent, const ResI= d& rId ) : long nTextWidth =3D aOutSiz.Width() - nDlgMargin; =20 aCopyrightText.SetText( aCopyrightTextStr ); -=09 + + // layout fixed text controls layoutText( aVersionText, nY, nTextWidth, a6Size ); - nY +=3D nCtrlMargin; - =20 + if( aBuildString.Len() > 0 ) + { + nY +=3D ( a6Size.Height() / 2 ); + layoutText( aBuildData, nY, nTextWidth, a6Size ); + } + nY +=3D nCtrlMargin; + // OK-Button-Position (at the bottom and centered) Size aOKSiz =3D aOKButton.GetSizePixel(); Point aOKPnt =3D aOKButton.GetPosPixel(); diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk index cd7a989..d5c9124 100644 --- a/cui/source/dialogs/makefile.mk +++ b/cui/source/dialogs/makefile.mk @@ -38,6 +38,10 @@ ENABLE_EXCEPTIONS=3DTRUE CFLAGS+=3D -DENABLE_LAYOUT=3D1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$= (INPATH)/inc .ENDIF # ENABLE_LAYOUT =3D=3D TRUE =20 +.IF "$(BUILD_VER_STRING)" !=3D "" +CFLAGS+=3D -DBUILD_VER_STRING=3D"$(BUILD_VER_STRING)" +.ENDIF + # --- Files -------------------------------------------------------- =20 SRS1NAME=3Ddialogs --=20 1.7.7.4 --vtzGhvizbBRQ85DL-- --EuxKj2iCbKjpUGkD Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAEBCAAGBQJO8PwwAAoJEMjP1bm45QNWS+QQALSf1c4qxrmDKZumlttgqEpb eM/ljr4OZW2zfjgb/hz1eqpWJHFamEgqTaY0wnLYsTVYD6681YUn4+lxV93bdqZ4 DSkL8j9VjvibTZhRtdiB9j9gntr41K802I8k9WV5cKMEaZ3054dHa94LGTKgVPtw O5/2chKoorlZGioB+j97JdxbYSsUu3N+tI8QufEZPMtGFVPtMOIXTq3HOew63f26 F6aHGMUpzosBT1SjiOfmox64qu7B3ShhjElFqN6K3W8pD3XA2GZSxcNGz2qFTUmQ 0HJoYwqWEACaR/cmA1ErraQupin7tuOaylKUf4stv0q2cQlzTOhsXbSTH/vC99Ly CqJKf5rov5vqx0KN/082BUbszLWzVa6V8xC/dSHCm6Mh/DqunZk7+PWRts1FiP4m QJVF3bNPLDUwOgIbKrvLVnGo+qLHSFw/essT2JlJ9uYcz1V+mgpP8o1qmY4W1BkQ P16tJjpPLyS/+jdvMWhmLw6d9jEBTPX+qyg+7aTFK7q1ou1xgPtSonY1LUknvNq1 X+D0VyxBBC3WO9iF1rW50rnYX/pssDR6W0s/z+J4ErbjehixmJARJwThhsZ3bkDy FzC2avf8RykDYhCfZx8NZUVGjYP3HGJL1UvNXBgwCa5yFzLwOttBXyYFUEd99PNG F92vVvqDF+s1fnrPO8sz =MbGw -----END PGP SIGNATURE----- --EuxKj2iCbKjpUGkD--