Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
OpenFOAM-plus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Development
OpenFOAM-plus
Commits
0cfd1adb
Commit
0cfd1adb
authored
9 years ago
by
Henry Weller
Browse files
Options
Downloads
Patches
Plain Diff
wmake: Improve messages from wclean, wrmdep and wmakeLnIncludeAll
parent
d16324bf
No related branches found
No related tags found
1 merge request
!60
Merge foundation
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
wmake/wclean
+4
-8
4 additions, 8 deletions
wmake/wclean
wmake/wmakeLnIncludeAll
+1
-0
1 addition, 0 deletions
wmake/wmakeLnIncludeAll
wmake/wrmdep
+13
-8
13 additions, 8 deletions
wmake/wrmdep
with
18 additions
and
16 deletions
wmake/wclean
+
4
−
8
View file @
0cfd1adb
...
@@ -123,7 +123,7 @@ then
...
@@ -123,7 +123,7 @@ then
fi
fi
# Provide some feedback
# Provide some feedback
echo
"
$Script
${
dir
:-
.
/
}
"
echo
"
$Script
$targetType
${
dir
:-
.
}
"
fi
fi
...
@@ -135,18 +135,16 @@ if [ "$targetType" = empty ]
...
@@ -135,18 +135,16 @@ if [ "$targetType" = empty ]
then
then
# First pass: clean up empty source code directories
# First pass: clean up empty source code directories
echo
"
Searching for
empty directories..."
echo
"
Removing
empty directories..."
# Get sub-directories avoiding particular directories
# Get sub-directories avoiding particular directories
for
dir
in
$(
find
.
-mindepth
1
-maxdepth
1
\
for
dir
in
$(
find
.
-mindepth
1
-maxdepth
1
\
-type
d
\(
-name
.git
-prune
-o
-print
\)
)
-type
d
\(
-name
.git
-prune
-o
-print
\)
)
do
do
echo
"
check dir
:
$dir
"
echo
"
searching
:
$dir
"
find
$dir
-depth
-type
d
-empty
-exec
rmdir
{}
\;
-print
find
$dir
-depth
-type
d
-empty
-exec
rmdir
{}
\;
-print
done
done
echo
"Search for empty directories complete."
# Second pass: clean up object directories with WM_PROJECT_DIR that don't
# Second pass: clean up object directories with WM_PROJECT_DIR that don't
# have respective source code folders, along with the respective binaries
# have respective source code folders, along with the respective binaries
...
@@ -157,7 +155,7 @@ then
...
@@ -157,7 +155,7 @@ then
if
[
-d
$objectsDir
]
if
[
-d
$objectsDir
]
then
then
echo
"
Searching for deprecated
object directories
at:
$objectsDir
"
echo
"
Removing redundant
object directories
in
$objectsDir
"
find
$objectsDir
-name
'variables'
-print
|
\
find
$objectsDir
-name
'variables'
-print
|
\
while
read
variablesFile
while
read
variablesFile
...
@@ -197,8 +195,6 @@ then
...
@@ -197,8 +195,6 @@ then
rm
-rvf
$depFile
2>/dev/null
rm
-rvf
$depFile
2>/dev/null
fi
fi
done
done
echo
"Search for deprecated object directories complete."
fi
fi
fi
fi
...
...
This diff is collapsed.
Click to expand it.
wmake/wmakeLnIncludeAll
+
1
−
0
View file @
0cfd1adb
...
@@ -146,6 +146,7 @@ then
...
@@ -146,6 +146,7 @@ then
# Synchronize the file system to ensure that all of the links exist
# Synchronize the file system to ensure that all of the links exist
# before compilation
# before compilation
echo
" synchronizing file system to ensure that all of the links exist"
sync
sync
fi
fi
...
...
This diff is collapsed.
Click to expand it.
wmake/wrmdep
+
13
−
8
View file @
0cfd1adb
...
@@ -163,15 +163,17 @@ oldFolders)
...
@@ -163,15 +163,17 @@ oldFolders)
# Default is the current directory
# Default is the current directory
[
"$#"
-gt
0
]
||
set
--
.
[
"$#"
-gt
0
]
||
set
--
.
echo
"Removing dep files that refer to sources files that no longer exist..."
for
checkDir
for
checkDir
do
do
findObjectDir
$checkDir
findObjectDir
$checkDir
if
[
-d
$objectsDir
]
if
[
-d
$objectsDir
]
then
then
echo
"
S
earching:
$objectsDir
"
echo
"
s
earching:
$objectsDir
"
else
else
echo
"
S
kipping non-dir:
$objectsDir
"
echo
"
s
kipping non-dir:
$objectsDir
"
continue
continue
fi
fi
...
@@ -182,7 +184,7 @@ oldFolders)
...
@@ -182,7 +184,7 @@ oldFolders)
# Check C++ or Flex source file exists
# Check C++ or Flex source file exists
if
[
!
-r
"
$sourceFile
"
]
;
if
[
!
-r
"
$sourceFile
"
]
;
then
then
echo
"rm
$depFile
"
echo
"
rm
$depFile
"
rm
-f
$depFile
2>/dev/null
rm
-f
$depFile
2>/dev/null
fi
fi
done
done
...
@@ -192,20 +194,23 @@ oldFolders)
...
@@ -192,20 +194,23 @@ oldFolders)
updateMode
)
updateMode
)
[
"
$PWD
"
=
"
$WM_PROJECT_DIR
"
]
\
if
[
"
$PWD
"
!=
"
$WM_PROJECT_DIR
"
]
||
usage
"Not in the project top-level directory"
then
echo
"Cannot 'update', not in the project top-level directory"
exit
1
fi
echo
"
Purging all dep files that relate to
files that no longer exist..."
echo
"
Removing dep files corresponding to source
files that no longer exist..."
fileNameList
=
$(
find
-L
src applications
-name
'*.[CHL]'
-type
l
)
fileNameList
=
$(
find
-L
src applications
-name
'*.[CHL]'
-type
l
)
for
filePathAndName
in
$fileNameList
for
filePathAndName
in
$fileNameList
do
do
fileName
=
$(
basename
$filePathAndName
)
fileName
=
$(
basename
$filePathAndName
)
echo
"
Purging from
'src':
$fileName
"
echo
"
'src':
$fileName
"
cd
src
cd
src
$Script
-a
$fileName
$Script
-a
$fileName
echo
"
Purging from
'applications':
$fileName
"
echo
"
'applications':
$fileName
"
cd
../applications
cd
../applications
$Script
-a
$fileName
$Script
-a
$fileName
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment