Mercurial > hg > truffle

comparison make/windows/create_obj_files.sh @ 12014:31f3b1e1c5e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8016601: Unable to build hsx24 on Windows using project creator and Visual Studio Summary: ProjectCreator tool is modified to support two new options: '-relativeAltSrcInclude' and '-altRelativeInclude' which prevents IDE linker errors. Also fixed some cmd line build linker warnings. Misc cleanups. Reviewed-by: rdurbin, coleenp
author dcubed
date Thu, 08 Aug 2013 09:21:30 -0700
parents f2110083203d
children
comparison
equal deleted inserted replaced
12013:195ff07bc7f6 12014:31f3b1e1c5e5
71 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/${sd}" 71 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/${sd}"
72 done 72 done
73 73
74 BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles ${GENERATED}/tracefiles" 74 BASE_PATHS="${BASE_PATHS} ${GENERATED}/jvmtifiles ${GENERATED}/tracefiles"
75 75
76 if [ -d "${ALTSRC}/share/vm/jfr" ]; then 76 if [ -d "${ALTSRC}/share/vm/jfr/buffers" ]; then
77 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr"
78 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/buffers" 77 BASE_PATHS="${BASE_PATHS} ${ALTSRC}/share/vm/jfr/buffers"
79 fi 78 fi
80 79
81 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/share/vm/prims/wbtestmethods" 80 BASE_PATHS="${BASE_PATHS} ${COMMONSRC}/share/vm/prims/wbtestmethods"
82 81
83 CORE_PATHS="${BASE_PATHS}"
84 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS. 82 # shared is already in BASE_PATHS. Should add vm/memory but that one is also in BASE_PATHS.
85 if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then 83 if [ -d "${ALTSRC}/share/vm/gc_implementation" ]; then
86 CORE_PATHS="${CORE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`" 84 BASE_PATHS="${BASE_PATHS} `$FIND ${ALTSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"
87 fi 85 fi
88 CORE_PATHS="${CORE_PATHS} `$FIND ${COMMONSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`" 86 BASE_PATHS="${BASE_PATHS} `$FIND ${COMMONSRC}/share/vm/gc_implementation ! -name gc_implementation -prune -type d \! -name shared`"
89 87
90 if [ -d "${ALTSRC}/share/vm/c1" ]; then 88 if [ -d "${ALTSRC}/share/vm/c1" ]; then
91 COMPILER1_PATHS="${ALTSRC}/share/vm/c1" 89 COMPILER1_PATHS="${ALTSRC}/share/vm/c1"
92 fi 90 fi
93 COMPILER1_PATHS="${COMPILER1_PATHS} ${COMMONSRC}/share/vm/c1" 91 COMPILER1_PATHS="${COMPILER1_PATHS} ${COMMONSRC}/share/vm/c1"
102 COMPILER2_PATHS="${COMPILER2_PATHS} ${COMMONSRC}/share/vm/libadt" 100 COMPILER2_PATHS="${COMPILER2_PATHS} ${COMMONSRC}/share/vm/libadt"
103 COMPILER2_PATHS="${COMPILER2_PATHS} ${GENERATED}/adfiles" 101 COMPILER2_PATHS="${COMPILER2_PATHS} ${GENERATED}/adfiles"
104 102
105 # Include dirs per type. 103 # Include dirs per type.
106 case "${TYPE}" in 104 case "${TYPE}" in
107 "core") Src_Dirs="${CORE_PATHS}" ;; 105 "compiler1") Src_Dirs="${BASE_PATHS} ${COMPILER1_PATHS}" ;;
108 "compiler1") Src_Dirs="${CORE_PATHS} ${COMPILER1_PATHS}" ;; 106 "compiler2") Src_Dirs="${BASE_PATHS} ${COMPILER2_PATHS}" ;;
109 "compiler2") Src_Dirs="${CORE_PATHS} ${COMPILER2_PATHS}" ;; 107 "tiered") Src_Dirs="${BASE_PATHS} ${COMPILER1_PATHS} ${COMPILER2_PATHS}" ;;
110 "tiered") Src_Dirs="${CORE_PATHS} ${COMPILER1_PATHS} ${COMPILER2_PATHS}" ;; 108 "zero") Src_Dirs="${BASE_PATHS}" ;;
111 "zero") Src_Dirs="${CORE_PATHS}" ;; 109 "shark") Src_Dirs="${BASE_PATHS}" ;;
112 "shark") Src_Dirs="${CORE_PATHS}" ;;
113 esac 110 esac
114 111
115 COMPILER2_SPECIFIC_FILES="opto libadt bcEscapeAnalyzer.cpp c2_* runtime_*" 112 COMPILER2_SPECIFIC_FILES="opto libadt bcEscapeAnalyzer.cpp c2_* runtime_*"
116 COMPILER1_SPECIFIC_FILES="c1_*" 113 COMPILER1_SPECIFIC_FILES="c1_*"
117 SHARK_SPECIFIC_FILES="shark" 114 SHARK_SPECIFIC_FILES="shark"
120 # Always exclude these. 117 # Always exclude these.
121 Src_Files_EXCLUDE="jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp" 118 Src_Files_EXCLUDE="jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp"
122 119
123 # Exclude per type. 120 # Exclude per type.
124 case "${TYPE}" in 121 case "${TYPE}" in
125 "core") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;;
126 "compiler1") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;; 122 "compiler1") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;;
127 "compiler2") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;; 123 "compiler2") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;;
128 "tiered") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;; 124 "tiered") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${ZERO_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES}" ;;
129 "zero") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${COMPILER2_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;; 125 "zero") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${COMPILER2_SPECIFIC_FILES} ${SHARK_SPECIFIC_FILES} ciTypeFlow.cpp" ;;
130 "shark") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES}" ;; 126 "shark") Src_Files_EXCLUDE="${Src_Files_EXCLUDE} ${COMPILER1_SPECIFIC_FILES} ${COMPILER2_SPECIFIC_FILES} ${ZERO_SPECIFIC_FILES}" ;;
147 Src_Files= 143 Src_Files=
148 for e in ${Src_Dirs}; do 144 for e in ${Src_Dirs}; do
149 Src_Files="${Src_Files}`findsrc ${e}` " 145 Src_Files="${Src_Files}`findsrc ${e}` "
150 done 146 done
151 147
152 Obj_Files= 148 Obj_Files=" "
153 for e in ${Src_Files}; do 149 for e in ${Src_Files}; do
154 Obj_Files="${Obj_Files}${e%\.[!.]*}.obj " 150 o="${e%\.[!.]*}.obj"
151 set +e
152 chk=`expr "${Obj_Files}" : ".* $o"`
153 set -e
154 if [ "$chk" != 0 ]; then
155 echo "# INFO: skipping duplicate $o"
156 continue
157 fi
158 Obj_Files="${Obj_Files}$o "
155 done 159 done
156 160
157 echo Obj_Files=${Obj_Files} 161 echo Obj_Files=${Obj_Files}