Permalink
Browse files

fix conflicts

  • Loading branch information...
2 parents ccdb71a + 236fb25 commit 1966c1c3c847257c41519f96c05c625d2e759216 @Whiteknight committed Mar 24, 2010
Showing with 14 additions and 6 deletions.
  1. +7 −5 addons/parrot.sh
  2. +4 −0 addons/projects.sh
  3. +3 −1 addons/setup.sh
View
@@ -8,11 +8,12 @@
alias pcn="parrot-nqp Configure.nqp"
alias pcs="parrot setup.pir build"
-# Where the Parrot repo is, shortcut.
-PARROTSVN="https://svn.parrot.org/parrot"
-
# Setup some arguments that are always used to configure Parrot
-WKPARROTSTDARGS="--no-line-directives"
+# --no-line-directives seems to cause some problems now
+WKPARROTSTDARGS=""
+
+# Var to simplify parrot svn operations
+PARROTSVN="https://svn.parrot.org/parrot"
# Parrot configuration. If the first argument is the name of a supported compiler,
# use that compiler. Otherwise all arguments are passed to Configure.pl
@@ -69,7 +70,7 @@ function pc {
# If we have flex and bison, set that up. No sense in not using them
local WKPARROTMAINTAINER=""
- __find_program flex bison && WKPARROTMAINTAINER="--maintainer"
+ #__find_program flex bison && WKPARROTMAINTAINER="--maintainer"
if [ -e "Configure.pl" ]; then
echo "Configuring with: '$WKPARROTMAINTAINER $WKCOMMANDLINE $WKPARROTSTDARGS $*'"
@@ -108,6 +109,7 @@ function parrot-smoke {
# Function to checkout parrot trunk or a particular branch.
function parrot-get {
local PARROTFOLDER=${1:-"parrot"}
+ # TODO: Should have a way to get the latest RELEASE tag.
if [ ! -e $WKPROJECTS/$PARROTFOLDER ]; then
if [ $PARROTFOLDER == "parrot" ]; then
svn co $PARROTSVN/trunk $WKPROJECTS/parrot
View
@@ -3,6 +3,10 @@
# Move to the projects root directory
alias projects="cd $WKPROJECTS && PS1='\n<projects> ' && ls --color=always"
+function cdl {
+ cd $1 && ls
+}
+
# Update the prompt used when we change branch/version
function __update_version {
local WKPGVERSION=$(perl $WKPROJECTS/utils/get_version.pl)
View
@@ -9,4 +9,6 @@ function global_setup {
exit
}
-
+function compilers {
+ echo "no"
+}

0 comments on commit 1966c1c

Please sign in to comment.