[FFmpeg-devel] [PATCH] web: Copy FFmpeg Logo by Makefile instead of cronjob

[Thilo Borgmann]

Am 08.04.12 09:12, schrieb Michael Niedermayer:
> On Sun, Apr 08, 2012 at 12:10:10AM +0200, Thilo Borgmann wrote:
>> Am 08.04.12 00:04, schrieb Michael Niedermayer:
>>> On Sun, Apr 08, 2012 at 12:02:36AM +0200, Thilo Borgmann wrote:
>>>> Am 07.04.12 20:19, schrieb Michael Niedermayer:
>>>>> On Sat, Apr 07, 2012 at 03:32:05PM +0200, Thilo Borgmann wrote:
>>>>>> Am 07.04.12 12:36, schrieb Thilo Borgmann:
>>>>>>> Am 07.04.12 01:36, schrieb Michael Niedermayer:
>>>>>>>> [...]
>>>>>>>>>> files in /src should not be written to, its a nightmare to maintain
>>>>>>>>>> and in this case will not even work as the git hook will break on the
>>>>>>>>>> next checkout
>>>>>>>>>
>>>>>>>>> Hm this is less easy to solve... What exactly does that git hook do?
>>>>>>>>
>>>>>>>> it updates the checkout :)
>>>>>>>> and if theres a changed file in there it will fail. (your patch
>>>>>>>> contained the file too...)
>>>>>>>
>>>>>>> Oh of course. Well it is a file because a new clone or a push at a day without
>>>>>>> any $(DATE)* file should use the previously defined text. A new clone will fail
>>>>>>> if there is no file already in the repo. Then I think...
>>>>>>>
>>>>>>>
>>>>>>>>> Maybe it's sufficient and more suitable then to have an intermediate directory
>>>>>>>>> for dynamically generated parts of the website?
>>>>>>>>
>>>>>>>> cant the hover text be changed by CSS and the whole CSS file be changed
>>>>>>>> like the logo ?
>>>>>>>
>>>>>>> ... it's unavoidable to have such a directory which contains files not under
>>>>>>> version control. AFAIK CSS cannot handle the job - it can change color, size,
>>>>>>> style and things but not influence a hovertext. One has to choose between
>>>>>>> javascript or plain html for that.
>>>>>>
>>>>>> New patches attached to use files in such a directory.
>>>>>>
>>>>>> For 0001:
>>>>>> Bug fixed by not including $(LOGO_FILES) in $(TARGETS). Otherwise make clean
>>>>>> does delete the files in src/logik...
>>>>>>
>>>>>> For 0002:
>>>>>> Works well and even with non-phony targets. But I don't know how to include an
>>>>>> empty directory into git. Alternatively also create the inter/ directory in the
>>>>>> makefile... or have a dummy/readme file in inter/ for git...
>>>>>>
>>>>>> -Thilo
>>>>>
>>>>> [...]
>>>>>> +
>>>>>> +inter/template_head2: src/template_head2 inter/template_head2_hovertext
>>>>>> +	sed -e "s/HOVERTEXT/`cat $@_hovertext`/g" $< > $@
>>>>>
>>>>> security risk
>>>>
>>>> I could have used that answer some time ago...
>>>> Going to rework the hovertext patch tomorrow. Would be good to know if the
>>>> sedcommands file is not a security issue? Thinking of something like that not to
>>>> cat file content to the make recipe.
>>>
>>> i was planing to get rid of the sedcommands file ...
>>
>> What is that going to look like? I can either wait for you with that hovertext
>> patch or try to get something done on a base of something you've already thought
>> about.
> 
> hmm, in absence of anyone providing a better idea (which would be
> welcome...)
> 
> my plan was to
> 1. move the sedcommands into the makefile
> 2. move the html in them in to seperate files
> 3. use r that_seperate_file in the sed inside the makefile

I don't really understand 3. Can you elaborate or give a short example?

I just had a look and it seems to me sed_commands it currently not used anyway?
However, for a hovertext we would need something like that again. Also if we
would include a secondary navbar somewhere again...


> [...]

-Thilo