Issue 110427 - native0 integrated a (different from DEV300/cws mysqlconnector) mysqlc into OOO320?
Summary: native0 integrated a (different from DEV300/cws mysqlconnector) mysqlc into O...
Status: CLOSED NOT_AN_OOO_ISSUE
Alias: None
Product: Build Tools
Classification: Code
Component: www (show other issues)
Version: current
Hardware: All All
: P1 (highest) Trivial (vote)
Target Milestone: ---
Assignee: dirk.voelzke
QA Contact: issues@tools
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-03-26 23:30 UTC by rene
Modified: 2013-08-07 15:35 UTC (History)
7 users (show)

See Also:
Issue Type: DEFECT
Latest Confirmation in: ---
Developer Difficulty: ---


Attachments
the differences (12.99 KB, patch)
2010-03-26 23:35 UTC, rene
no flags Details | Diff
correct diff (3.70 KB, patch)
2010-03-29 08:32 UTC, Frank Schönheit
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this issue.
Description rene 2010-03-26 23:30:30 UTC
In a OOO320_m14 clone:

$ ls my*
mysqlc:
images  prj  source  version.mk

mysqlcppconn:
cppconn_config.pmk  makefile.mk       mysql-connector-cpp.patch
download            mysql_config.pmk  prj

oh? cws mysqlconnector was only integrated for DEV300. Was it intended that
it went over to OOO320 via native0? (Who "fixed" it for rebranding and
probably thus just merged the cws).

If I look at e.g. mysqlc/version.mk:

$ hg log version.mk 
Änderung:        263405:b562f62892bf
Nutzer:          obo <obo@openoffice.org>
Datum:           Tue Mar 09 12:48:44 2010 +0100
Zusammenfassung: #i10000# commit repaired changeset

Änderung:        263399:28f77bc32e70
Nutzer:          Dirk Voelzke <dv@openoffice.org>
Datum:           Thu Mar 04 16:00:23 2010 +0100
Zusammenfassung: native0ext:#161688# rebranding extensions
                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Even more, those two copies (what went into OOO320 and what went into DEV300 via
cws mysqlcppconn) differ; see attached patch.

Was that intended? If yes, close this and nevermind, but as noone was told..
And if the changes done in OOO320 will get lost in DEV300 that's bad, too
1.0.1 final vs. 1.0.1 alpha.... And the version in OOO320 introduced again
a build bug with internal mysqlcppconn (yes, it's a bug to -lmysqlcppconn in
mysqlcppconn's build).

Can this be cleaned up? please ASAP?
Comment 1 rene 2010-03-26 23:31:31 UTC
Ccing hr, obo, fs, md, of

again one case of really good looking what goes into the tree...
Comment 2 rene 2010-03-26 23:35:12 UTC
Created attachment 68567 [details]
the differences
Comment 3 rene 2010-03-26 23:45:05 UTC
the differences:

- branding (ok..)
- extension identifier changes (bad, as the extension with the arch-dep
identifier already is on extensions.s.oo and in use in distribution packages=
- supress-if-required (ok...)
- loosing the buildfixes in mysqlc/source/makefile.mk and
mysqlcppconn/mysql_config.pmk
- state change Alpha -> Final.

Intended? Shouldn't this better have been in a extra cws if so?
Comment 4 rene 2010-03-26 23:46:12 UTC
either way it's intended (then the bugs should be fixed, for "next build"), or
it's not and it should be reverted from OOO320 (at which time it's "next build"
in any case)
Comment 5 rene 2010-03-27 00:06:46 UTC
oh, and you loosed some other bugfixes, including the "default to tcp" one...
Comment 6 Frank Schönheit 2010-03-29 08:32:57 UTC
Created attachment 68602 [details]
correct diff
Comment 7 Frank Schönheit 2010-03-29 08:36:41 UTC
fs->rene: you should compare the right things before weeping. The DEV300-version
which you used for comparison was never intended to be copied to OOO320. If we
would have done so, you would probably have cried, too, since this is indeed an
alpha version, which differs from the release extension.

Instead, the version from CWS mysqlnative (at a point in SVN where this CWS did
not yet see unsuccessful cross-code-line rebase attempts) which was released as
1.0.0 was copied over to the OOO320 code line, with minor adjustments.

mysqlc-ppconn.diff contains the differences between the released 1.0.0 extension
version, and the version in OOO320.m14. As you can see, this is indeed basically
rebranding (plus a change to the extension's OXT file name, whose cause I do not
know, but which is certainly uncritical).

Resolving issue as INVALID.
Comment 8 Frank Schönheit 2010-03-29 08:36:54 UTC
closing
Comment 9 rene 2010-03-29 08:59:41 UTC
> fs->rene: you should compare the right things before weeping. The DEV300-
> version which you used for comparison was never intended to be copied to
> OOO320. If we would have done so, you would probably have cried, too, since
> this is indeed an alpha version, which differs from the release extension.

No, I wouldn't. Actually I right now have a extension still based on
mysqlnative and had mysqlconnector backported now. 

> Instead, the version from CWS mysqlnative (at a point in SVN where this CWS
> did not yet see unsuccessful cross-code-line rebase attempts) which was
> released as 1.0.0 was copied over to the OOO320 code line, with minor
> adjustments.

Aha. So it was intended. Good that people actually get told.

> mysqlc-ppconn.diff contains the differences between the released 1.0.0
> extension version, and the version in OOO320.m14. As you can see, this is
> indeed basically  rebranding (plus a change to the extension's OXT file name,
> whose cause I do not know, but which is certainly uncritical).

-   
EXTENSION_ZIPNAME:=$(EXTENSIONNAME)-$(EXTENSION_VERSION_BASE)-$(MYSQLC_STATUS:s/
/-/:l)-$(RTL_OS:l)-$(RTL_ARCH:l)
+    EXTENSION_ZIPNAME:=$(EXTENSIONNAM

I'd not call this "rebranding" but "changing the extension identifier"

Besides that, what you added to OOO320 DOES miss the buildfixes I did in
cws mysqlnative. Should I really need patches to apply myself again because
you cannot get them over properly?

> Resolving issue as INVALID.

If you wish, I now now that the merge was intended (of course no one told
anyone) but that the extension identifier changes is BAD. And the lost
buildfixes too.
Comment 10 rene 2010-03-29 09:03:16 UTC
(and I needed cws mysqlconnector because of Issue 110068, where the patch didn't
apply against the old mysqlnative iirc)
Comment 11 rene 2010-03-29 09:06:19 UTC
> I'd not call this "rebranding" but "changing the extension identifier"

And even if you wanted to get rid of parts, I don't think you wanted to get rif
of the arch-stuff there (or do you? I'd be happy)

The current change just results in changing from

Identifier: com.sun.star.mysql-connector-ooo-linux_x86_64

to

Identifier: com.sun.star.mysql-connector-ooo

Comment 12 rene 2010-03-29 09:08:45 UTC
reopening because of the extension identifier change at least (and we REALLY
should get the buildfixes in)
Comment 13 Frank Schönheit 2010-03-29 09:14:26 UTC
> I'd not call this "rebranding" but "changing the extension identifier"

No, the *extension identifier* is the thing mentioned in the description.xml.
What was changed here is the name of the resulting .oxt file, which has nothing
to do with the extension identifier. In fact, even in CWS mysqlnative, the .oxt
files as generated during build were (for at least one platform) renamed before
being uploaded to the extension site ...

An now, I cannot answer you why this change was made, that's up to Dirk to
answer, who (I think) did it.

> Besides that, what you added to OOO320 DOES miss the buildfixes I did in
> cws mysqlnative. Should I really need patches to apply myself again because
> you cannot get them over properly?

Hmm - is it possible that you added those fixes after the 1.0 release? We just
copied over the 1.0 release version. But since SVN screw up the thing during a
rebase attempt, it might well be possible we missed something there.

Re-closing as INVALID. Nearly all of the stuff you claimed in the original
description is bogus, including the "extension identifier" thing, as explained
above.

If you need a build issue to be fix, submit a usual build breaker issue, please.
Comment 14 Frank Schönheit 2010-03-29 09:14:39 UTC
closing
Comment 15 Frank Schönheit 2010-03-29 09:15:20 UTC
> An now
should read "And no"
Comment 16 Frank Schönheit 2010-03-29 09:15:39 UTC
closing.
Comment 17 rene 2010-03-29 09:24:48 UTC
> Hmm - is it possible that you added those fixes after the 1.0 release? We just
> copied over the 1.0 release version. But since SVN screw up the thing during a
> rebase attempt, it might well be possible we missed something there.

i did them when I did them. As you can't properly sync extension released with
code, yes, I might have committed it after the release-

> Re-closing as INVALID. Nearly all of the stuff you claimed in the original
> description is bogus,

If you add mysqlc to OOO320 silently and loose important stuff, I should be
wary, shouldn't I? You should have told people that you did this...

> including the "extension identifier" thing, as explained above.

True. That might be my error.

> If you need a build issue to be fix, submit a usual build breaker issue, please.

as you wish. Issue 
Comment 18 rene 2010-03-29 09:27:42 UTC
"If you add mysqlc to OOO320 silently"

In a BUGFIX release. 3.2.1..
Comment 19 rene 2010-03-29 09:34:43 UTC
> If you need a build issue to be fix, submit a usual build breaker issue, please.

there you go. Issue 110460