Build issues

[Lubomir I. Ivanov]

On 15 February 2015 at 21:18, Dirk Hohndel <dirk at hohndel.org> wrote:
> On Sun, Feb 15, 2015 at 09:12:18PM +0200, Lubomir I. Ivanov wrote:
>> On 15 February 2015 at 21:01, Dirk Hohndel <dirk at hohndel.org> wrote:
>> >> > Also with the new write-version thingy... the first time I run make, I get
>> >> > something weird like "sh: Syntax error, unexpected end of line in line:1"
>> >> > Starting the make again works. Any idea what's up with that?
>> >>
>> >> can't seem to reproduce it...let me look into it again.
>> >> Thiago said that it works for him (under Linux i assume).
>> >
>> > I had this happen on Linux both native and cross building for Windows. But
>> > only the first time I try it. Haven't done a clean checkout and tried
>> > again.
>> >
>>
>> that's odd.
>>
>> > I just ran into another problem. You removed a ton of stuff from
>> > subsurface-install.pri that was used to set up the versions. You ignored
>> > the fact that the variables used in that process are reused later in that
>> > file both for Windows and Mac builds... So this all needs to be redesigned
>> > in order to make sure that this data is now assembled at make time
>> > (instead of at qmake time).
>>
>> yakes, so variables from subsurface-gen-version.pri are used in
>> subsurface-install.pri.
>> FULL_VERSION, PRODVERSION_STRING to name a few.
>
> Yes, it's a mess. A complete idiot when it comes to qmake (i.e., me) has
> hacked this badly to make his setup work :-/
>
>> > Right now this prevents me from doing my usual Windows and Mac builds :-(
>>
>> sorry about that. this is way more entangled than i tough.
>> for now, i can just bring some of those variables as $system() calls
>> on qmake time?
>
> I gotta run and do family things for the next few hours. I'd love to see
> proposed patches that fix the mess :-)
>

FTM, this is what i can provide as a quick solution (attached).

it means that the -install.pri commands will be created on qmake-time,
which is still tolerable in a way.

one real problem is that i can't really work on the -install.pri
because i have no way to test it.
(e.g. no OSX and my DLL setup is completely different)

please, let me know if i missed a variable so that i can amend the patch!

ideally we should have external bourne scripts (like i did for
write-version), and minimize the code in -install.pri and Makefile*.
this will be easier to maintain since we all know how to write SH,
more or less.

lubomir
--
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0007-PRI-include-some-variables-in-the-version-generation.patch
Type: application/octet-stream
Size: 1315 bytes
Desc: not available
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20150215/8f1fa010/attachment.obj>