Skip to content

Commit 09f86ee

Browse files
committed
build: .cproject and .project is renamed to .cproject.default and .project.default
These files were constantly overwritten by the IDE causing merge conflicts. They moved to xxx.default and these files are copied/moved to .project and .cproject either on the distro creation or when setenv is sourced and .project or .cproject does not exists yet. This will prevent constant overwrite as these files are no longe rpart of the repo and they are .gitignored
1 parent 721e1c6 commit 09f86ee

5 files changed

Lines changed: 13 additions & 0 deletions

File tree

File renamed without changes.

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,5 @@ xxx
105105
/tmp/
106106
/.computed/
107107
*.DS_Store
108+
.cproject
109+
.project
File renamed without changes.

releng/makedist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ cp -r doc/src/_build/latex/*.pdf $INET_ROOT/out/$DIRNAME/doc || { echo --- error
4242

4343
# switch to the destination dir
4444
cd $INET_ROOT/out/$DIRNAME
45+
4546
# patching files
4647
perl -i -pe $REGEXPREPLACE s/##BUILDID##/$BUILDID/g doc/neddoc/overview.html
4748
perl -i -pe $REGEXPREPLACE s/##BUILDID##/$BUILDID/g src/inet-index.ned
@@ -50,6 +51,8 @@ perl -i -pe $REGEXPREPLACE s/##BUILDID##/$BUILDID/g src/inet-index.ned
5051
rm -rf _scripts doc/src doc/misc releng .agent .windsurf .github .settings .gitattributes .gitignore .gitmodules .circleci .travis.yml .clang-format .oppfeaturestate .nedexclusions
5152
mv .oppfeaturestate.default .oppfeaturestate
5253
mv .nedexclusions.default .nedexclusions
54+
mv .project.default .project
55+
mv .cproject.default .cproject
5356

5457
todofiles=$(find . -name '__TODO*')
5558
if [ "$todofiles" != "" ]; then

setenv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ if [ "$1" = "-r" ]; then
4141
return 0
4242
fi
4343

44+
if [ ! -f "$dir/.project" ] && [ -f "$dir/.project.default" ]; then
45+
cp "$dir/.project.default" "$dir/.project"
46+
fi
47+
48+
if [ ! -f "$dir/.cproject" ] && [ -f "$dir/.cproject.default" ]; then
49+
cp "$dir/.cproject.default" "$dir/.cproject"
50+
fi
51+
4452
export PATH=$dir/bin:$PATH
4553
export PYTHONPATH=$dir/python:$PYTHONPATH && PYTHONPATH=${PYTHONPATH%:} # required because colon at the end causes issues on Windows
4654
export INET_ROOT=$dir

0 commit comments

Comments
 (0)