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

finalize wmake/utilbin/ -> wmake/bin/ change

Browse Source 
- update foamPack* scripts accordingly
This commit is contained in:
Mark Olesen
2009-07-17 17:20:54 +02:00
parent dbf3d84560
commit 5cca4df2f0
6 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/foamPack
View File

@ -89,7 +89,7 @@ find -H $packDir \
-e "\@$packDir/lib/@d" \ -e "\@$packDir/lib/@d" \
-e '\@/\.git/@d' \ -e '\@/\.git/@d' \
-e '\@applications/bin/@d' \ -e '\@applications/bin/@d' \
-e '\@wmake/utilbin/@d' \ -e '\@wmake/bin/@d' \
-e '\@/t/@d' \ -e '\@/t/@d' \
-e '\@Make[.A-Za-z]*/[^/]*/@d' \ -e '\@Make[.A-Za-z]*/[^/]*/@d' \
-e '\@doc/[Dd]oxygen/html@d' \ -e '\@doc/[Dd]oxygen/html@d' \

2
bin/foamPackBin
View File

@ -76,7 +76,7 @@ dirList=$(
$packDir/lib/$arch \ $packDir/lib/$arch \
$packDir/applications/bin/$arch \ $packDir/applications/bin/$arch \
$packDir/wmake/rules \ $packDir/wmake/rules \
$packDir/wmake/utilbin/$baseArch \ $packDir/wmake/bin/$baseArch \
; ;
do do
[ -d $dir ] && echo $dir [ -d $dir ] && echo $dir

2
bin/foamPackSource
View File

@ -82,7 +82,7 @@ find -H $packDir \
-e '\@/\.git/@d' \ -e '\@/\.git/@d' \
-e '\@/\.tags/@d' \ -e '\@/\.tags/@d' \
-e '\@applications/bin/@d' \ -e '\@applications/bin/@d' \
-e '\@wmake/utilbin/@d' \ -e '\@wmake/bin/@d' \
-e '\@/t/@d' \ -e '\@/t/@d' \
-e '\@/Make[.A-Za-z]*/[^/]*/@d'\ -e '\@/Make[.A-Za-z]*/[^/]*/@d'\
-e '\@/platforms/@d' \ -e '\@/platforms/@d' \

4
wmake/Makefile
View File

@ -29,7 +29,9 @@
# Generic Makefile used by wmake # Generic Makefile used by wmake
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Set shell the Makefile uses to the Bourne shell
#------------------------------------------------------------------------------
# The Makefile use a POSIX shell
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
SHELL = /bin/sh SHELL = /bin/sh

2
wmake/makeWmake
View File

@ -34,6 +34,6 @@
# run from this directory only # run from this directory only
cd ${0%/*} || exit 1 cd ${0%/*} || exit 1
( cd src && make ) ( cd src && make $@ )
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

26
wmake/src/Makefile
View File

@ -43,8 +43,23 @@ SHELL = /bin/sh
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .o .SUFFIXES: .o
#------------------------------------------------------------------------------
# set compilation and dependency building rules
#------------------------------------------------------------------------------
GENERAL_RULES = $(WM_DIR)/rules/General
RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER) BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
include $(RULES)/general
include $(RULES)/$(WM_LINK_LANGUAGE)
#------------------------------------------------------------------------------
# targets
#------------------------------------------------------------------------------
all: $(BIN)/dirToString $(BIN)/wmkdep all: $(BIN)/dirToString $(BIN)/wmkdep
clean: clean:
@ -59,16 +74,7 @@ $(BIN)/wmkdep: wmkdep.l
@mkdir -p $(BIN) @mkdir -p $(BIN)
flex wmkdep.l flex wmkdep.l
$(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep $(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep
@rm -f lex.yy.c 2>/dev/null
#------------------------------------------------------------------------------
# set compilation and dependency building rules
#------------------------------------------------------------------------------
GENERAL_RULES = $(WM_DIR)/rules/General
RULES = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
include $(RULES)/general
include $(RULES)/$(WM_LINK_LANGUAGE)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------