-
Notifications
You must be signed in to change notification settings - Fork 62
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
File name conflict on macOS StRoot/RTS/include/FTP/FTPC_PADKEY.h #194
Comments
I think so,
It looks like that file was generated probably by the FTPC group and given to Tonko... the "online/ftpc" directory was never owned by DAQ.
Tonko, do you need the version FTPC_PADKEY.h for anything? Can I delete it from the cvs so this problem doesn't crop up again next time?
…-Jeff
________________________________
From: Dmitri Smirnov ***@***.***>
Sent: Monday, November 15, 2021 11:39 AM
To: star-bnl/star-sw ***@***.***>
Cc: Landgraf, Jeffery M. ***@***.***>; Mention ***@***.***>
Subject: [star-bnl/star-sw] File name conflict on macOS StRoot/RTS/include/FTP/FTPC_PADKEY.h (Issue #194)
See this thread originally posted by @plexoos<https://github.com/plexoos> in #167 (comment)<#167 (comment)>
The files with conflicting names on case insensitive systems are
./StRoot/RTS/include/FTP/ftpc_padkey.h
./StRoot/RTS/include/FTP/FTPC_PADKEY.h
ftpc_padkey.h was removed in ecfe0a0<ecfe0a0> then reintroduced in 62ac395<62ac395> (#167<#167>) by reasoning that it is used by the online code. Indeed
$ grep -I -r 'ftpc_padkey.h' online/ OnlTools/ | grep '#include'
online/RTS/src/MZ/mzFmt.C:#include <FTP/ftpc_padkey.h>
online/RTS/src/SB/sbGainParser.C://#include <FTP/new_ftpc_padkey.h>
online/RTS/src/SB/sbGainParser.C:#include <FTP/ftpc_padkey.h>
On the other hand, FTPC_PADKEY.h appears to be a generated file
$ grep -I -r 'FTPC_PADKEY.h' online/ OnlTools/
online/ftpc/MapFtpcElectronicsToDaq/FtpcKeys.c: fo = fopen("FTPC_PADKEY.h","w");
online/ftpc/MapFtpcElectronicsToDaq/Makefile: rm -f FtpcKeys FTPC_PADKEY.h
online/ftpc/MapFtpcElectronicsToDaq/doc/FtpcElectronicsMapping.html: FTPC_PADKEY.h - this is the file Tonko uses
The question is: Can we remove (or rename) 'FTPC_PADKEY.h'? @tonko-lj<https://github.com/tonko-lj> @jml985<https://github.com/jml985>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#194>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AKQGF6LVARJM7DU7YAXF2B3UMEZVVANCNFSM5IB7WIVA>.
Triage notifications on the go with GitHub Mobile for iOS<https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!VrpWxkcfekZu0WxqfoQ_3zzFvSetQ1FdSEMTxz3OQHxw4Tdaw5CBB7m1TKMm$> or Android<https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign*3Dnotification-email*26utm_medium*3Demail*26utm_source*3Dgithub__;JSUlJSU!!P4SdNyxKAPE!VrpWxkcfekZu0WxqfoQ_3zzFvSetQ1FdSEMTxz3OQHxw4Tdaw5CBB6wUIIM6$>.
|
plexoos
added a commit
that referenced
this issue
Nov 15, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it should resolve #194
plexoos
added a commit
that referenced
this issue
Nov 15, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it should resolve #194
starsdong
pushed a commit
that referenced
this issue
Nov 17, 2021
plexoos
added a commit
to plexoos/star-sw
that referenced
this issue
Nov 18, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194
veprbl
pushed a commit
to veprbl/star-sw
that referenced
this issue
Dec 3, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194 (cherry picked from commit fecf319)
jml985
pushed a commit
that referenced
this issue
Dec 7, 2021
marrbnl
pushed a commit
that referenced
this issue
Dec 8, 2021
plexoos
added a commit
that referenced
this issue
Dec 13, 2021
plexoos
added a commit
to plexoos/star-sw
that referenced
this issue
Dec 13, 2021
This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194 (cherry picked from commit fecf319)
plexoos
added a commit
to plexoos/star-sw
that referenced
this issue
Dec 13, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (star-bnl#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves star-bnl#194. For details see star-bnl#194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this issue
Dec 13, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this issue
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this issue
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this issue
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this issue
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
plexoos
added a commit
that referenced
this issue
Dec 14, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589) Rename file to avoid name conflict on case insensitive systems StarVMC/StarBASE/macros/differential.py -> StarVMC/StarBASE/macros/differentiate.py The files with conflicting names are: StarVMC/StarBASE/macros/differential.py StarVMC/StarBASE/macros/Differential.py (cherry picked from commit 0203666) Resolve file name collision by moving test macro The files with conflicting names on case insensitive systems are: StRoot/macros/test/micky.C StRoot/macros/test/Micky.C micky.C is a macro testing a class in St_baseTest (cherry picked from commit 1e2f63a)
plexoos
added a commit
that referenced
this issue
Dec 23, 2021
Keep only one of the two identical files OnlTools/OnlinePlots/icons/FileOpen.xpm OnlTools/OnlinePlots/icons/fileopen.xpm OnlTools/OnlinePlots/images/FileOpen.xpm OnlTools/OnlinePlots/images/fileopen.xpm (cherry picked from commit f38fcf8) Remove StRoot/RTS/include/FTP/FTPC_PADKEY.h (#195) This file appears to be unused but conflicts with StRoot/RTS/include/FTP/ftpc_padkey.h Removing it resolves #194. For details see #194 (cherry picked from commit fecf319) Rename files to avoid conflict on case insensitive filesystems StRoot/StMCFilter/StGENParticle.h StRoot/StMCFilter/StGENParticle.cxx conflict with StRoot/StMCFilter/StGenParticle.h StRoot/StMCFilter/StGenParticle.cxx (cherry picked from commit dd096f6) Rename class s/StGENParticle/StGimParticle/ (cherry picked from commit d982cb9) Rename class s/StarLight/StarLightGen/ and file StRoot/StarGenerator/StarLight/StarLight.cxx -> StRoot/StarGenerator/StarLight/StarLightGen.cxx StRoot/StarGenerator/StarLight/StarLight.h -> StRoot/StarGenerator/StarLight/StarLightGen.h (cherry picked from commit 816f589)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
See this thread originally posted by @plexoos in #167 (comment)
The files with conflicting names on case insensitive systems are
ftpc_padkey.h
was removed in ecfe0a0 then reintroduced in 62ac395 (#167) by reasoning that it is used by the online code. IndeedOn the other hand,
FTPC_PADKEY.h
appears to be a generated fileThe question is: Can we remove (or rename) 'FTPC_PADKEY.h'? @tonko-lj @jml985
The text was updated successfully, but these errors were encountered: