zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2009-07-17 17:08:30 +02:00
parent 33358fd383 9557f2cb6e
commit dbf3d84560
53 changed files with 652 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wmake/Makefile
View File

@ -106,7 +106,7 @@ SEXE = a.out
GENERAL_RULES = $(WM_DIR)/rules/General
RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER)
BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
include $(GENERAL_RULES)/general
include $(RULES)/general

11
wmake/rules/General/java
View File

@ -1,11 +0,0 @@
.SUFFIXES: .java .class
javac = javac
## avoid recursive include if WM_JAVAC_OPTION isn't defined
## include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION)
javaFLAGS = -classpath $(CLASS_PATH):$(CLASSES_DIR):. $(EXE_INC) $(javaOPT) $(javaDBUG) -d $(CLASSES_DIR) -deprecation
javatoclass = mkdir -p $(CLASSES_DIR) ; \
( $(javac) $(javaFLAGS) $$SOURCE || ( rm -f $@ ) )

2
wmake/rules/General/javaDebug
View File

@ -1,2 +0,0 @@
javaDBUG = -g
javaOPT =

2
wmake/rules/General/javaOpt
View File

@ -1,2 +0,0 @@
javaDBUG =
javaOPT = -O

5
wmake/rules/General/sourceToDep
View File

@ -1,4 +1,4 @@
.SUFFIXES: .c .cc .cxx .cpp .C .java .F .f .dep
.SUFFIXES: .c .cc .cxx .cpp .C .F .f .dep
MKDEP = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
@ -17,9 +17,6 @@ MKDEP = $(UTILBIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
.C.dep:
$(MAKE_DEP)
.java.dep:
$(MAKE_DEP)
.F.dep:
$(MAKE_DEP)

1
wmake/rules/General/standard
View File

@ -2,7 +2,6 @@ include $(GENERAL_RULES)/version
include $(GENERAL_RULES)/sourceToDep
include $(GENERAL_RULES)/java
include $(GENERAL_RULES)/flex
include $(GENERAL_RULES)/flex++
## include $(GENERAL_RULES)/byacc

1
wmake/rules/linuxmingw32/general
View File

@ -7,7 +7,6 @@ include $(RULES)/X
include $(GENERAL_RULES)/sourceToDep
include $(GENERAL_RULES)/java
include $(GENERAL_RULES)/flex
include $(GENERAL_RULES)/flex++
include $(GENERAL_RULES)/byacc

31
wmake/scripts/addCompile
View File

@ -53,30 +53,13 @@ else
cat > $depName
fi
sed -e s%".*.o.*:"%'$(OBJECTS_DIR)/'"$objectName\:"% \
-e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'% \
>> $depName
if [ "$sub" = java ]
then
sed -e s%"\(.*\).class.*:"%'$(CLASSES_DIR)/'"\1.class\:"% \
-e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'% \
>> $depName
echo '$(CLASSES_DIR)/'$sourceDir/$className': $(EXE_DEP)' >> $depName
echo '$(CLASSES_DIR)/'$sourceDir/$className':' >> $depName
echo ' @SOURCE_DIR='$sourceDir '\' >> $depName
echo ' SOURCE='$1' ; $('$sub'toclass)' >> $depName
else
sed -e s%".*.o.*:"%'$(OBJECTS_DIR)/'"$objectName\:"% \
-e s%$WM_PROJECT_DIR%'$(WM_PROJECT_DIR)'% \
>> $depName
echo '$(OBJECTS_DIR)/'$objectName': $(EXE_DEP)' >> $depName
echo '$(OBJECTS_DIR)/'$objectName':' >> $depName
echo ' @SOURCE_DIR='$sourceDir >> $depName
echo ' SOURCE='$1' ; $('$sub'too)' >> $depName
fi
echo '$(OBJECTS_DIR)/'$objectName': $(EXE_DEP)' >> $depName
echo '$(OBJECTS_DIR)/'$objectName':' >> $depName
echo ' @SOURCE_DIR='$sourceDir >> $depName
echo ' SOURCE='$1' ; $('$sub'too)' >> $depName
#------------------------------------------------------------------------------

6
wmake/scripts/makeFiles
View File

@ -39,7 +39,7 @@ then
exit 1
fi
utilbin=$WM_DIR/utilbin/$WM_ARCH$WM_COMPILER
bin=$WM_DIR/bin/$WM_ARCH$WM_COMPILER
[ -d Make ] || mkdir Make
rm -f Make/files
@ -51,7 +51,7 @@ do
if [ $dir != . ]
then
baseDir=`echo $dir | sed 's%^\./%%'`
baseDirName=`echo $baseDir | $utilbin/dirToString`
baseDirName=`echo $baseDir | $bin/dirToString`
if [ $baseDirName != Make ]
then
@ -66,7 +66,7 @@ files=`find . -name "*.[cCylfF]" -type f -print`
for file in $files
do
pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $utilbin/dirToString`
pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $bin/dirToString`
fileName=`echo ${file##*/}`
if [ "$pathName" != "" ]

18
wmake/src/Makefile
View File

@ -43,22 +43,22 @@ SHELL = /bin/sh
.SUFFIXES:
.SUFFIXES: .o
UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER)
BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
all: $(UTILBIN)/dirToString $(UTILBIN)/wmkdep
all: $(BIN)/dirToString $(BIN)/wmkdep
clean:
rm -f $(UTILBIN)/dirToString $(UTILBIN)/wmkdep 2>/dev/null
rm -f $(BIN)/dirToString $(BIN)/wmkdep 2>/dev/null
$(UTILBIN)/dirToString: dirToString.c
@mkdir -p $(UTILBIN)
$(cc) $(cFLAGS) dirToString.c -o $(UTILBIN)/dirToString
$(BIN)/dirToString: dirToString.c
@mkdir -p $(BIN)
$(cc) $(cFLAGS) dirToString.c -o $(BIN)/dirToString
$(UTILBIN)/wmkdep: wmkdep.l
@mkdir -p $(UTILBIN)
$(BIN)/wmkdep: wmkdep.l
@mkdir -p $(BIN)
flex wmkdep.l
$(cc) $(cFLAGS) lex.yy.c -o $(UTILBIN)/wmkdep
$(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep
#------------------------------------------------------------------------------

4
wmake/src/dirToString.c
View File

@ -34,10 +34,10 @@ Usage
e.g.
using sh
baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString`
baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString`
using csh
set baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString`
set baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString`
\*----------------------------------------------------------------------------*/

18
wmake/wmakeDerivedFiles
View File

@ -53,9 +53,6 @@ grep -v "=" files > filesPlusBlank
# Add a newline to files to make sure the last line is followed by a newline
echo "" >> filesPlusBlank
# Search for java files in filesPlusBlank
nJava=`grep "\.java" filesPlusBlank | wc -l`
# Remove commented lines blank lines, and trailing blanks from files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -81,17 +78,10 @@ rm tmpSourceFile
# make objectFiles
# ~~~~~~~~~~~~~~~~
if [ $nJava -ne 0 ]
then
sed -e 's%^%$(CLASSES_DIR)/%' \
-e 's%\.[a-zA-Z]*$%\.class%' \
files.$$ > tmpObjectFiles
else
sed -e 's%.*/%%' \
-e 's%^%$(OBJECTS_DIR)/%' \
-e 's%\.[a-zA-Z]*$%\.o%' \
files.$$ > tmpObjectFiles
fi
sed -e 's%.*/%%' \
-e 's%^%$(OBJECTS_DIR)/%' \
-e 's%\.[a-zA-Z]*$%\.o%' \
files.$$ > tmpObjectFiles
echo "OBJECTS = " > tmpObjectFiles2
cat tmpObjectFiles >> tmpObjectFiles2