Fix of the .classpath generation under OS X

damienmg · hanwen · commit 07072b0d2983 · 2015-03-24T16:40:33.000Z
--
MOS_MIGRATED_REVID=89291020
diff --git a/scripts/generate-classpath.sh b/scripts/generate-classpath.sh
@@ -84,7 +84,7 @@ function get_containing_library() {
     get_consuming_target $1 | sed 's|:|/lib|' | sed 's|^//|bazel-bin/|' | sed 's|$|.jar|'
 }
 
-for path in $(find bazel-genfiles/ -name "*.java" | sed 's|/\{0,1\}bazel-genfiles/\{0,1\}|//|'); do
+for path in $(find bazel-genfiles/ -name "*.java" | sed 's|/\{0,1\}bazel-genfiles/\{1,2\}|//|'); do
     source_path=$(echo $path | sed 's|//|bazel-genfiles/|' | sed 's|/com/.*$||')
     echo "    <classpathentry kind=\"lib\" path=\"$(get_containing_library ${path})\" sourcepath=\"${source_path}\"/>"
 done | sort -u

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ function get_containing_library() {`
`84`	`84`	`get_consuming_target $1 \| sed 's\|:\|/lib\|' \| sed 's\|^//\|bazel-bin/\|' \| sed 's\|$\|.jar\|'`
`85`	`85`	`}`
`86`	`86`
`87`		`-for path in $(find bazel-genfiles/ -name "*.java" \| sed 's\|/\{0,1\}bazel-genfiles/\{0,1\}\|//\|'); do`
	`87`	`+for path in $(find bazel-genfiles/ -name "*.java" \| sed 's\|/\{0,1\}bazel-genfiles/\{1,2\}\|//\|'); do`
`88`	`88`	`source_path=$(echo $path \| sed 's\|//\|bazel-genfiles/\|' \| sed 's\|/com/.*$\|\|')`
`89`	`89`	`echo " <classpathentry kind=\"lib\" path=\"$(get_containing_library ${path})\" sourcepath=\"${source_path}\"/>"`
`90`	`90`	`done \| sort -u`