Recent

Author Topic: fcplazup problem with the keeplocalchanges option  (Read 769 times)

freek

  • Newbie
  • Posts: 1
fcplazup problem with the keeplocalchanges option
« on: August 28, 2021, 05:40:28 pm »
First of all, many thanks for the great installation tool you maintain.

Now to my question concerning fpclazup-i386-win32.exe v2.0.1a on Windows 7.

For years I use fcplazup as the central tool to transparently autocreate security software binaries from sources at the user's Windows computer, shipped within an InnoSetup file.  In order to integrate the source code of a Lazarus control I modified, after pulling data from the repository [lazdld] I overwrote the original .inc file and reran fcplazup with the 'keeplocalchanges=true' option [lazbld].

Code: Text  [Select][+][-]
  1. [lazdld]
  2. logfilename=fpclazup.log
  3. installdir=F:\MyApp_IDE
  4. fpcurl=https://gitlab.com/freepascal.org/fpc/source
  5. lazurl=https://gitlab.com/freepascal.org/lazarus/lazarus
  6. fpcrevision=3.3.1-8790-g98574a88a3
  7. lazrevision=main-2_3-304-g0ab69e8387
  8. fpcopt="-g -gl -O1"
  9. lazopt="-g -gl -O1"
  10. verbose
  11. noconfirm=true
  12. fpcuplinkname=""
  13. lazlinkname="MyApp IDE"
  14. keeplocalchanges=false
  15. only=LazarusGetOnly,HelpLazarusGetOnly
  16.  
  17. [lazbld]
  18. logfilename=fpclazup.log
  19. installdir=F:\MyApp_IDE
  20. fpcurl=https://gitlab.com/freepascal.org/fpc/source
  21. lazurl=https://gitlab.com/freepascal.org/lazarus/lazarus
  22. fpcrevision=3.3.1-8790-g98574a88a3
  23. lazrevision=main-2_3-304-g0ab69e8387
  24. fpcopt="-g -gl -O1"
  25. lazopt="-g -gl -O1"
  26. verbose
  27. noconfirm=true
  28. fpcuplinkname=""
  29. lazlinkname="MyApp IDE"
  30. keeplocalchanges=true
  31. only=Lazarus,HelpLazarus
  32.  

While moving from SVN to GitLab I now noticed, that 'keeplocalchanges' no longer works and, though it seems to be recognized, repository data are restored.

Code: Text  [Select][+][-]
  1.  [2021-08-28 16:38:15.677 Info] LazarusNativeInstaller (GetModule: Lazarus): Executing: F:\MyApp_IDE\fpcbootstrap\git\cmd\git.exe log -n 1 --grep=^git-svn-id: (working dir: F:\MyApp_IDE\lazarus)
  2.  [2021-08-28 16:38:15.847 Info] Lazarus: WARNING: found modified files.
  3.  [2021-08-28 16:38:15.857 Info] lcl\include\customcombobox.inc
  4.  [2021-08-28 16:38:15.857 Info] Diff with last revision stored in F:\MyApp_IDE\lazarus\revhash_main-0-g0ab69e8387.difffffff
  5.  [2021-08-28 16:38:15.867 Info] Lazarus: reverting to original before updating.
  6. [...]
  7.  [2021-08-28 16:38:57.086 Info] LazarusNativeInstaller (GetModule: Lazarus): Executing: F:\MyApp_IDE\fpcbootstrap\git\cmd\git.exe log -n 1 --grep=^git-svn-id: (working dir: F:\MyApp_IDE\lazarus)
  8.  [2021-08-28 16:38:57.237 Info] Lazarus: WARNING: found modified files.
  9.  [2021-08-28 16:38:57.247 Info] lcl\include\customcombobox.inc
  10.  [2021-08-28 16:38:57.247 Info] Lazarus: leaving modified files as is before updating.
  11.  

Is it git that, different from svn, doesn't accept such an approach, so that I have to integrate my code changes with some git command call? Do I have to modify my settings.ini file in any way? Or is there some other workaround?

TIA

 

TinyPortal © 2005-2018