Issue 23344 - Build with 4NT fails due to conflicting SOURCEVERSION=FIX645 in minor.mk
Summary: Build with 4NT fails due to conflicting SOURCEVERSION=FIX645 in minor.mk
Status: CLOSED FIXED
Alias: None
Product: Build Tools
Classification: Code
Component: solenv (show other issues)
Version: OOo 1.1
Hardware: All All
: P1 (highest) Trivial (vote)
Target Milestone: OOo 1.1.1
Assignee: hjs
QA Contact: issues@tools
URL:
Keywords:
Depends on:
Blocks: 23529
  Show dependency tree
 
Reported: 2003-12-09 14:15 UTC by quetschke
Modified: 2006-03-14 21:03 UTC (History)
3 users (show)

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

Attachments
Patch for config_office/ (1.13 KB, patch)
2003-12-10 01:05 UTC, quetschke 		no flags Details | Diff
Oops, use this patch instead (1.13 KB, patch)
2003-12-10 01:20 UTC, quetschke 		no flags Details | Diff
Not my day today, this should really work (1.14 KB, patch)
2003-12-10 03:09 UTC, quetschke 		no flags Details | Diff
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this issue.
Description quetschke 2003-12-09 14:15:13 UTC 
This is for branch cws_srx645_ooo111fix1

The build with 4NT fails due to conflicting SOURCEVERSION=FIX645 in minor.mk.

This is no issue for all non 4NT using systems because they generate

$SOLARVER/$UPD/$INPATH/inc/${UPD}minor.mk in ./bootstrap but for 4NT settings.mk
tries this and fails because of $(SOURCEVERSION) != $(WORK_STAMP)

CC'ing ause

I set this to P1 because it breaks the build for all 4NT users.
Comment 1 quetschke 2003-12-09 14:18:13 UTC 
Set target 1.1.1
Comment 2 hjs 2003-12-09 17:52:45 UTC 
this seem to me rather an issue of "config_office" which assumes a "WORK_STAMP"
prefix of "SRX" which is wrong in this case.
"solenv/inc/minor.mk" is allways right ;-)
this check was meant to detect environment<->sourcetree missmatch.
Comment 3 quetschke 2003-12-09 18:31:09 UTC 
> this seem to me rather an issue of "config_office" which assumes a "WORK_STAMP"
> prefix of "SRX" which is wrong in this case.

Yup, will think about some magic in set_soenv to parse the minor.mk file.

> this check was meant to detect environment<->sourcetree missmatch.

Well, it does this only when settings.mk is generating ${UPD}minor.mk
and not always. This is a solenv bug ;-) and after I fixed set_soenv this
should be fixed.
Comment 4 hjs 2003-12-09 19:20:08 UTC 
hmm, you're right! if the "*minor.mk" file in "solver" would contain the full
"WORK_STAMP" the check would be more complete:
wrong "WORK_STAMP" ->
"*minor.mk" in solver not found ->
rule used ->
error...
Comment 5 quetschke 2003-12-10 01:05:25 UTC 
Created attachment 11845 [details]
Patch for config_office/
Comment 6 quetschke 2003-12-10 01:12:46 UTC 
OK, this is the patch to make it build with 4NT. Please approve and tell
me where to commit.

To avoid code duplication I would propose to remove the:

--- bootstrap.2 ---
# create a minor.mk file

if ( !( -e $SOLARVER/$UPD/$INPATH/inc/${UPD}minor.mk ) ) then
   mkdir -p $SOLARVER
   mkdir -p $SOLARVER/$UPD
   mkdir -p $SOLARVER/$UPD/$INPATH
   mkdir -p $SOLARVER/$UPD/$INPATH/inc

   cd $SOLARVER/$UPD/$INPATH/inc
   cat $SOLARENV/inc/minor.mk > ${UPD}minor.mk
   cd ${SRC_ROOT}
endif
--- bootstrap.2 ---

part. settings.mk takes care about that part.
Comment 7 quetschke 2003-12-10 01:20:10 UTC 
Created attachment 11847 [details]
Oops, use this patch instead
Comment 8 quetschke 2003-12-10 03:09:53 UTC 
Created attachment 11848 [details]
Not my day today, this should really work
Comment 9 jens-heiner.rechtien 2003-12-10 18:32:27 UTC 
Comitted to ooo111fix1.
Comment 10 quetschke 2003-12-10 23:31:47 UTC 
Heiner,

you have to regenerate configure when you're changing configure.in ;-)

Volker
Comment 11 jens-heiner.rechtien 2003-12-11 13:52:10 UTC 
Ups. What was I thinking. Committed configure, too
Comment 12 quetschke 2003-12-13 16:54:54 UTC 
verified
Comment 13 quetschke 2003-12-13 16:55:19 UTC 
close