diff options
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | scripts/xinitrc | 6 |
2 files changed, 13 insertions, 1 deletions
@@ -4,6 +4,12 @@ SCRIPTS = $(CURDIR)/scripts JHBUILD = $(CURDIR)/install/bin/jhbuild -f $(SCRIPTS)/jhbuildrc LOG = $(SCRIPTS)/log-command +ifdef SUGAR_SESSION +XINITDISPLAY = :100 +else +XINITDISPLAY = :99 +endif + # The buildbot shell does not handle script properly. It's unnecessary # anyway because we can't use interactive scripts there. ifdef SUGAR_BUILDBOT @@ -43,7 +49,7 @@ build-%: $(TYPESCRIPT) "$(JHBUILD) buildone $*" $(LOGFILE) run: scripts/list-outputs - xinit $(SCRIPTS)/xinitrc -- :99 + xinit $(SCRIPTS)/xinitrc -- $(XINITDISPLAY) test: $(LOG) "$(SCRIPTS)/run-dogtail-tests" $(LOGFILE) diff --git a/scripts/xinitrc b/scripts/xinitrc index 466d4f0..1dca413 100644 --- a/scripts/xinitrc +++ b/scripts/xinitrc @@ -23,6 +23,12 @@ do fi done +if [ -z $SUGAR_SESSION ]; then + export SUGAR_SESSION=yes +else + export SUGAR_PROFILE=development +fi + JHBUILD="$ROOT_DIR/install/bin/jhbuild -f $ROOT_DIR/scripts/jhbuildrc" RUN_COMMAND="dbus-launch --exit-with-session sugar" |