Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions base/version_git.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
# This file is a part of Julia. License is MIT: http://julialang.org/license

# This file collects git info and create a julia file with the GIT_VERSION_INFO struct
Expand Down
2 changes: 1 addition & 1 deletion contrib/check-whitespace.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh
# This file is a part of Julia. License is MIT: http://julialang.org/license

# Check for trailing white space in source files;
Expand Down
14 changes: 10 additions & 4 deletions contrib/commit-name.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
#!/bin/bash
#!/bin/sh
# This file is a part of Julia. License is MIT: http://julialang.org/license

last_tag=$(git describe --tags --abbrev=0)
echo -n "0.4.0-dev+"
git rev-list ${1-HEAD} ^$last_tag | wc -l | sed -e 's/[^[:digit:]]//g'
# Need to be run from a julia repo clone
# First argument (Optional) is a ref to the commit

gitref=${1:-HEAD}

last_tag=$(git describe --tags --abbrev=0 "$gitref")
ver=$(git show "$gitref:VERSION")
nb=$(git rev-list --count "$gitref" "^$last_tag")
echo "$ver+$nb"
4 changes: 2 additions & 2 deletions contrib/mac/app/run-install-name-tool-change.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ WRONG_PREFIX=$2
RIGHT_PREFIX="@executable_path/../$3"
ACTION=$4

if [ "x$ACTION" == "xchange" ]; then
if [ "x$ACTION" = "xchange" ]; then
libs="`otool -L $LIBRARY 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $WRONG_PREFIX | sort | uniq`"
for lib in $libs; do
if ! echo $lib | grep --silent "@executable_path" ; then
fixed=`echo $lib | sed -e s,\$WRONG_PREFIX,\$RIGHT_PREFIX,`
install_name_tool -change $lib $fixed $LIBRARY
fi
done;
elif [ "x$ACTION" == "xid" ]; then
elif [ "x$ACTION" = "xid" ]; then
lib="`otool -D $LIBRARY 2>/dev/null | grep ^$WRONG_PREFIX`"
install_name_tool -id "$RIGHT_PREFIX/$lib" $LIBRARY;
fi
Expand Down
3 changes: 1 addition & 2 deletions contrib/mac/mac-gtk.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/bin/sh
# This file is a part of Julia. License is MIT: http://julialang.org/license

#/bin/sh

# This script will attempt to download and build GTK+-3,
# including dependencies, in ~/gtk (also puts stuff in
# ~/.local, ~/Source, ~/.jhbuildrc*)
Expand Down
2 changes: 1 addition & 1 deletion test/perf/micro/java/setup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh
# This file is a part of Julia. License is MIT: http://julialang.org/license

mvn compile exec:java
Expand Down