07.02.2011 23:27, Zaher Dirkey пишет:
2011/2/7 Mattias Gaertner <[email protected] <mailto:[email protected]>>Zaher Dirkey <[email protected] <mailto:[email protected]>> hat am 7. Februar 2011 um 16:04 geschrieben:2011/2/7 Mattias Gaertner <[email protected] <mailto:[email protected]>> Zaher Dirkey <[email protected] <mailto:[email protected]>> hat am 7. Februar 2011 um 15:20 geschrieben:I use svn update then it give me the file Makefile.compiled is conflicted. I think Makefile.compiled have to be ignored file.No. It is used. It was outdated. I updated it. Mattias I revert this files, but when install components package this files changed after. i do itafter i made "svn update", "Make clean bigide" in command line , then install component in IDE.What Makefile.compiled files are changed? Maybe I forgot one. The changed file components/fpcunit/ide/Makefile.compiled components/memds/Makefile.compiled components/printers/design/Makefile.compiled components/printers/Makefile.compiled components/projecttemplates/Makefile.compiled components/rtticontrols/Makefile.compiled components/sdf/Makefile.compiled components/sqldb/Makefile.compiled components/tachart/Makefile.compiled components/tdbf/Makefile.compiled components/turbopower_ipro/Makefile.compiled I am not modified the units of this packages.
IDE changes slashes in these files. See attachment. I think it happens if Makefile.compiled was generated and committed in Linux/Unix and then Lazarus is recompiled on Windows.
-- Best regards, Maxim Ganetsky mailto:[email protected]
--- H:/DOCUME~1/Max/LOCALS~1/Temp/Makefile.compile-revBASE.svn001.tmp.compiled Âò ôåâ 8 00:42:19 2011 +++ I:/FPC/Lazarus/components/fpcunit/ide/Makefile.compiled Âò ôåâ 8 00:39:55 2011 @@ -1,5 +1,5 @@ <?xml version="1.0"?> <CONFIG> <Makefile Value="True"/> - <Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fu../../../ideintf/units/%(CPU_TARGET)-%(OS_TARGET);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET)/%(LCL_PLATFORM);../../../lcl/units/%(CPU_TARGET)-%(OS_TARGET);../../../packager/units/%(CPU_TARGET)-%(OS_TARGET);. -dLCL -dLCL%(LCL_PLATFORM) fpcunitide.pas"/> + <Params Value=" -MObjFPC -Scgi -O1 -gl -vewnhi -l -Fu..\..\..\ideintf\units\%(CPU_TARGET)-%(OS_TARGET);..\..\..\lcl\units\%(CPU_TARGET)-%(OS_TARGET)\%(LCL_PLATFORM);..\..\..\lcl\units\%(CPU_TARGET)-%(OS_TARGET);..\..\..\packager\units\%(CPU_TARGET)-%(OS_TARGET);. -dLCL -dLCL%(LCL_PLATFORM) fpcunitide.pas"/> </CONFIG>
-- _______________________________________________ Lazarus mailing list [email protected] http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
