Mercurial > hg > truffle

comparison make/windows/create_obj_files.sh @ 2206:e1523f7fd848

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author rottenha
date Fri, 11 Feb 2011 05:40:41 -0800
parents d8a72fbc4be7
children 1d1603768966
comparison
equal deleted inserted replaced
2198:e9f24eebafd4 2206:e1523f7fd848
49 Platform_os_arch=windows_$Platform_arch 49 Platform_os_arch=windows_$Platform_arch
50 50
51 WorkSpace=$4 51 WorkSpace=$4
52 GENERATED=$5 52 GENERATED=$5
53 53
54 BASE_PATHS="` $FIND ${WorkSpace}/src/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)`" 54 COMMONSRC_REL=src
55 BASE_PATHS="${BASE_PATHS} ${WorkSpace}/src/share/vm/gc_implementation/shared" 55 ALTSRC_REL=src/closed # Change this to pick up alt sources from somewhere else
56 BASE_PATHS="${BASE_PATHS} ${WorkSpace}/src/os/${Platform_os_family}/vm" 56
57 BASE_PATHS="${BASE_PATHS} ${WorkSpace}/src/cpu/${Platform_arch}/vm" 57 COMMONSRC=${WorkSpace}/${COMMONSRC_REL}
58 BASE_PATHS="${BASE_PATHS} ${WorkSpace}/src/os_cpu/${Platform_os_arch}/vm" 58 ALTSRC=${WorkSpace}/${ALTSRC_REL}
59
60 BASE_PATHS="`if [ -d ${ALTSRC}/share/vm ]; then $FIND ${ALTSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \); fi`"
61 BASE_PATHS="${BASE_PATHS} ` $FIND ${COMMONSRC}/share/vm ! -name vm -prune -type d \! \( -name adlc -o -name c1 -o -name gc_implementation -o -name opto -o -name shark -o -name libadt \)`"
62
63 for sd in \
64 share/vm/gc_implementation/shared \
65 os/${Platform_os_family}/vm \
66 cpu/${Platform_arch}/vm \
67 os_cpu/${Platform_os_arch}/vm; do
68 if [ -d "${ALTSRC}/${sd}" ]; then
69 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/${sd}"
70 fi
71 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/${sd}"
72 done
73
59 BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles" 74 BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles"
60 75
61 CORE_PATHS="${BASE_PATHS}" 76 CORE_PATHS="${BASE_PATHS}"
62 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS. 77 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS.
63 CORE_PATHS="${CORE_PATHS} `$FIND ${WorkSpace}/src/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`" 78 if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then
79 CORE_PATHS="${CORE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"
80 fi
81 CORE_PATHS="${CORE_PATHS} `$FIND ${COMMONSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"
64 82
65 COMPILER1_PATHS="${WorkSpace}/src/share/vm/c1" 83 if [ -d "${ALTSRC}/share/vm/c1" ]; then
84 COMPILER1_PATHS="${ALTSRC}/share/vm/c1"
85 fi
86 COMPILER1_PATHS="${COMPILER1_PATHS} ${COMMONSRC}/share/vm/c1"
66 87
67 COMPILER2_PATHS="${WorkSpace}/src/share/vm/opto" 88 if [ -d "${ALTSRC}/share/vm/opto" ]; then
68 COMPILER2_PATHS="${COMPILER2_PATHS} ${WorkSpace}/src/share/vm/libadt" 89 COMPILER2_PATHS="${ALTSRC}/share/vm/opto"
90 fi
91 COMPILER2_PATHS="${COMPILER2_PATHS} ${COMMONSRC}/share/vm/opto"
92 if [ -d "${ALTSRC}/share/vm/libadt" ]; then
93 COMPILER2_PATHS="${COMPILER2_PATHS} ${ALTSRC}/share/vm/libadt"
94 fi
95 COMPILER2_PATHS="${COMPILER2_PATHS} ${COMMONSRC}/share/vm/libadt"
69 COMPILER2_PATHS="${COMPILER2_PATHS} ${GENERATED}/adfiles" 96 COMPILER2_PATHS="${COMPILER2_PATHS} ${GENERATED}/adfiles"
70 97
71 # Include dirs per type. 98 # Include dirs per type.
72 case "${TYPE}" in 99 case "${TYPE}" in
73 "core") Src_Dirs="${CORE_PATHS}" ;; 100 "core") Src_Dirs="${CORE_PATHS}" ;;