Menu
▾
▴
morphix-cvs — A list for all cvs commits done, to easily keep track of development
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(23) |
Nov
(20) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(43) |
Feb
(31) |
Mar
(99) |
Apr
(57) |
May
(82) |
Jun
(73) |
Jul
(123) |
Aug
(634) |
Sep
(588) |
Oct
(264) |
Nov
(217) |
Dec
(179) |
| 2005 |
Jan
(262) |
Feb
(273) |
Mar
(164) |
Apr
(88) |
May
(23) |
Jun
(10) |
Jul
(8) |
Aug
(19) |
Sep
(112) |
Oct
(57) |
Nov
(71) |
Dec
(6) |
| 2006 |
Jan
(14) |
Feb
(48) |
Mar
(56) |
Apr
(21) |
May
(77) |
Jun
(46) |
Jul
(47) |
Aug
(27) |
Sep
(18) |
Oct
(16) |
Nov
(4) |
Dec
(18) |
| 2007 |
Jan
(2) |
Feb
(6) |
Mar
(2) |
Apr
(27) |
May
(13) |
Jun
(27) |
Jul
(20) |
Aug
(3) |
Sep
(3) |
Oct
(23) |
Nov
(21) |
Dec
(6) |
| 2008 |
Jan
(7) |
Feb
(3) |
Mar
(4) |
Apr
(8) |
May
(3) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(11) |
Feb
(1) |
Mar
(8) |
Apr
|
May
|
Jun
(4) |
Jul
(6) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <bms...@us...> - 2007-11-09 23:36:03
|
Revision: 2591
http://morphix.svn.sourceforge.net/morphix/?rev=2591&view=rev
Author: bmsleight
Date: 2007-11-09 15:36:01 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
More django
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-09 23:34:22 UTC (rev 2590)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-09 23:36:01 UTC (rev 2591)
@@ -8,5 +8,5 @@
<p>In the meatime - have a look at the <a href=/view-queue/>queue of built and yet to be build kiosks</a><p>
<p>Will send an email when the elves have built the kiosk.<p>
-<p><a href=/template/{{newtemplate.template}}>Raw Template.xml</a><p>
+<p><a href=/templates/{{newtemplate.template}}>Raw Template.xml</a><p>
<p>You can cheak the status of your build request at anytime by visiting this page<p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-11-09 23:34:30
|
Revision: 2590
http://morphix.svn.sourceforge.net/morphix/?rev=2590&view=rev
Author: bmsleight
Date: 2007-11-09 15:34:22 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
More django
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
trunk/morphixlivekiosk/scripts/mbuild/urls.py
trunk/morphixlivekiosk/scripts/mbuild/web/models.py
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html
trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-09 23:34:22 UTC (rev 2590)
@@ -1,5 +1,12 @@
<h1>Custom Built Kiosk LiveCD</h1>
+<h2>Status</h2>
+{% if newtemplate.built %}
+ <p>Email has been sent, build is complete <p>
+{% else %}
+ <p>You build request is XXX in the list<p>
+{% endif %}
+<p>In the meatime - have a look at the <a href=/view-queue/>queue of built and yet to be build kiosks</a><p>
+<p>Will send an email when the elves have built the kiosk.<p>
-<p>Will email {{ emailnotify }} when the elves have built the kiosk.<p>
-
-<p>In the meatime - have a look at the <a href=/view-queue/>queue of built and yet to be build kiosks</a><p>
\ No newline at end of file
+<p><a href=/template/{{newtemplate.template}}>Raw Template.xml</a><p>
+<p>You can cheak the status of your build request at anytime by visiting this page<p>
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/kabt-queue.html 2007-11-09 23:34:22 UTC (rev 2590)
@@ -0,0 +1,2 @@
+{% if queue_list %}{% for queue in queue_list %}http://mbuild.livecd.org/mbuild/morphix.xml/{{ queue.template }}/
+{% endfor %}{% endif %}
\ No newline at end of file
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/master.xml 2007-11-09 23:34:22 UTC (rev 2590)
@@ -0,0 +1,22 @@
+<comps>
+ <group>
+ <kiosk>
+ <version>0.0.1</version>
+ <brand>{{newtemplate.brand}}</brand>
+ <graphic>http://mbuild.livecd.org/images/{{newtemplate.graphic}}</graphic>
+ <homepage>{{newtemplate.homepage}}</homepage>
+{% if newtemplate.navbar %} <navbar>true</navbar>
+{% else %} <navbar>true</navbar>
+{% endif %}
+ <extralist>
+{% if newtemplate.flash %} <MiniModule>MorphixMini-NonFree-FlashPlugin.xml</MiniModule> {% endif %}
+{% if newtemplate.java %} <MiniModule>MorphixMini-NonFree-Java.xml</MiniModule> {% endif %}
+ </extralist>
+ <network>
+{% if newtemplate.built %} <dhcp>dhcp</dhcp>
+{% else %} <dhcp></dhcp>
+{% endif %}
+ </network>
+ </kiosk>
+ </group>
+</comps>
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-09 23:34:22 UTC (rev 2590)
@@ -3,7 +3,7 @@
{% if queue_list %}
<ul>
{% for queue in queue_list %}
- <li>{{ queue.template }} <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? {{ queue.built }} </li>
+ <li><a href=/mbuild/status/{{ queue.template }}/>{{ queue.template }}</a> <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? {{ queue.built }} </li>
{% endfor %}
</ul>
{% else %}
Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-09 23:34:22 UTC (rev 2590)
@@ -2,8 +2,11 @@
urlpatterns = patterns('',
(r'^$', 'mbuild.web.views.index'),
- (r'^template/(?P<template>[^/]+)/', 'mbuild.web.views.template'),
+ (r'^mbuild/status/(?P<template>[^/]+)/', 'mbuild.web.views.mbuildstatus'),
+ (r'^xml/morphix/(?P<template>[^/]+)/', 'mbuild.web.views.converttokabtxml'),
+ (r'^mbuild/(?P<template>[^/]+)/', 'mbuild.web.views.mbuild'),
(r'^view-queue/', 'mbuild.web.views.viewqueue'),
+ (r'^kabt-queue/', 'mbuild.web.views.kabtqueue'),
(r'^delete-queue/', 'mbuild.web.views.delall'),
# Uncomment this for admin:
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/models.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-09 23:34:22 UTC (rev 2590)
@@ -8,4 +8,12 @@
built = models.BooleanField(default=False,
help_text="Has Kiosk been built")
notifybyemail = models.EmailField(null=True)
- homepage = models.CharField(maxlength="150")
\ No newline at end of file
+ homepage = models.CharField(maxlength="150")
+ navbar = models.BooleanField(default=False)
+ flash = models.BooleanField(default=False)
+ java = models.BooleanField(default=False)
+ graphic = models.CharField(maxlength="150")
+ builtdomain = models.CharField(maxlength="150")
+ builtiso = models.CharField(maxlength="150")
+ builtogg = models.CharField(maxlength="150")
+ builtjpg = models.CharField(maxlength="150")
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-08 22:43:23 UTC (rev 2589)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-09 23:34:22 UTC (rev 2590)
@@ -47,9 +47,9 @@
#Save details to dBase
template_name = "%s.xml" % uniq
- template = Queue(template=template_name, brand=cd['brand_name'], homepage=cd['homepage'])
+ template = Queue(template=template_name, brand=cd['brand_name'], homepage=cd['homepage'], navbar=cd['nav_bar'], flash=cd['flash'], java=cd['java'], graphic=cd['graphics'])
template.save()
- return HttpResponseRedirect("/template/%s/" % template_name )
+ return HttpResponseRedirect("/mbuild/%s/" % template_name )
else:
form = BuildForm()
@@ -57,7 +57,7 @@
return render_to_response('index.html', context,
context_instance=RequestContext(request))
-def template(request, template):
+def mbuild(request, template):
class BuildForm(forms.Form):
emailnotify = forms.EmailField("Email to recieve notifications?")
if request.POST:
@@ -68,13 +68,31 @@
newtemplate.save()
except Queue.DoesNotExist:
return HttpResponse("Template does not exist")
- return render_to_response("emailnotify.html",{"emailnotify":emailnotify})
+ return HttpResponseRedirect("/mbuild/status/%s/" % template )
else:
form = BuildForm()
context = {'form': form}
return render_to_response('index.html', context,
context_instance=RequestContext(request))
+def mbuildstatus(request, template):
+ try:
+ newtemplate = Queue.objects.get(pk=template)
+ return render_to_response("emailnotify.html",{"newtemplate":newtemplate})
+ except Queue.DoesNotExist:
+ return HttpResponse("Template does not exist")
+
+def converttokabtxml(request, template):
+ try:
+ newtemplate = Queue.objects.get(pk=template)
+ return render_to_response("master.xml",{"newtemplate":newtemplate})
+ except Queue.DoesNotExist:
+ return HttpResponse("Template does not exist")
+
+def kabtqueue(request):
+ queue_list = Queue.objects.filter(built=False).order_by('template')
+ return render_to_response('kabt-queue.html', {'queue_list': queue_list})
+
def viewqueue(request):
queue_list = Queue.objects.all().order_by('template')
return render_to_response('view-queue.html', {'queue_list': queue_list})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-11-08 22:43:32
|
Revision: 2589
http://morphix.svn.sourceforge.net/morphix/?rev=2589&view=rev
Author: bmsleight
Date: 2007-11-08 14:43:23 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
I really really _really_ like django
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/settings.py
trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
trunk/morphixlivekiosk/scripts/mbuild/templates/template.html
trunk/morphixlivekiosk/scripts/mbuild/urls.py
trunk/morphixlivekiosk/scripts/mbuild/web/models.py
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
Modified: trunk/morphixlivekiosk/scripts/mbuild/settings.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/settings.py 2007-11-07 23:26:27 UTC (rev 2588)
+++ trunk/morphixlivekiosk/scripts/mbuild/settings.py 2007-11-08 22:43:23 UTC (rev 2589)
@@ -81,4 +81,5 @@
'django.contrib.sessions',
'django.contrib.sites',
'mbuild.web',
+ 'django.contrib.admin',
)
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-07 23:26:27 UTC (rev 2588)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-08 22:43:23 UTC (rev 2589)
@@ -1,3 +1,5 @@
<h1>Custom Built Kiosk LiveCD</h1>
-<p>Will email {{ emailnotify }} when the elves have built the kiosk.<p>
\ No newline at end of file
+<p>Will email {{ emailnotify }} when the elves have built the kiosk.<p>
+
+<p>In the meatime - have a look at the <a href=/view-queue/>queue of built and yet to be build kiosks</a><p>
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/template.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/template.html 2007-11-07 23:26:27 UTC (rev 2588)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/template.html 2007-11-08 22:43:23 UTC (rev 2589)
@@ -1,5 +1,5 @@
<h1>Custom Built Kiosk LiveCD</h1>
-<p>Template {{ template }} is added to the queue to be built<p>
+<p>Template {{ template_name }} is added to the queue to be built<p>
<p>We can email you when the Kiosk has been built.<p>
<form enctype="multipart/form-data" method="post" action=".">
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/view-queue.html 2007-11-08 22:43:23 UTC (rev 2589)
@@ -0,0 +1,11 @@
+<h1>Custom Built Kiosk LiveCD</h1>
+
+{% if queue_list %}
+ <ul>
+ {% for queue in queue_list %}
+ <li>{{ queue.template }} <a href=http://{{ queue.homepage }}>{{ queue.brand }}</a> - Has been built ? {{ queue.built }} </li>
+ {% endfor %}
+ </ul>
+{% else %}
+ <p>No template in current queue.</p>
+{% endif %}
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-07 23:26:27 UTC (rev 2588)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-08 22:43:23 UTC (rev 2589)
@@ -3,8 +3,10 @@
urlpatterns = patterns('',
(r'^$', 'mbuild.web.views.index'),
(r'^template/(?P<template>[^/]+)/', 'mbuild.web.views.template'),
+ (r'^view-queue/', 'mbuild.web.views.viewqueue'),
+ (r'^delete-queue/', 'mbuild.web.views.delall'),
# Uncomment this for admin:
-# (r'^admin/', include('django.contrib.admin.urls')),
+ (r'^admin/', include('django.contrib.admin.urls')),
)
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/models.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-07 23:26:27 UTC (rev 2588)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-08 22:43:23 UTC (rev 2589)
@@ -4,7 +4,8 @@
class Queue(models.Model):
template = models.CharField(maxlength="20", primary_key=True)
- brand = models.CharField(maxlength="20")
+ brand = models.CharField(maxlength="150")
built = models.BooleanField(default=False,
help_text="Has Kiosk been built")
notifybyemail = models.EmailField(null=True)
+ homepage = models.CharField(maxlength="150")
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-07 23:26:27 UTC (rev 2588)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-08 22:43:23 UTC (rev 2589)
@@ -44,7 +44,12 @@
tree = ET.ElementTree(root)
tree.write("/var/www/templates/%s.xml" % uniq)
- return HttpResponseRedirect("/template/%s.xml/" % uniq )
+
+ #Save details to dBase
+ template_name = "%s.xml" % uniq
+ template = Queue(template=template_name, brand=cd['brand_name'], homepage=cd['homepage'])
+ template.save()
+ return HttpResponseRedirect("/template/%s/" % template_name )
else:
form = BuildForm()
@@ -57,6 +62,12 @@
emailnotify = forms.EmailField("Email to recieve notifications?")
if request.POST:
emailnotify = request.POST["emailnotify"]
+ try:
+ newtemplate = Queue.objects.get(pk=template)
+ newtemplate.notifybyemail = emailnotify
+ newtemplate.save()
+ except Queue.DoesNotExist:
+ return HttpResponse("Template does not exist")
return render_to_response("emailnotify.html",{"emailnotify":emailnotify})
else:
form = BuildForm()
@@ -64,3 +75,11 @@
return render_to_response('index.html', context,
context_instance=RequestContext(request))
+def viewqueue(request):
+ queue_list = Queue.objects.all().order_by('template')
+ return render_to_response('view-queue.html', {'queue_list': queue_list})
+
+def delall(request):
+ # Will disable when running live
+ Queue.objects.all().delete()
+ return HttpResponse("The Elves have deleted the whole queue.")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-11-07 23:26:30
|
Revision: 2588
http://morphix.svn.sourceforge.net/morphix/?rev=2588&view=rev
Author: bmsleight
Date: 2007-11-07 15:26:27 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
Not sure why incoming does not work
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-07 23:19:24 UTC (rev 2587)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-07 23:26:27 UTC (rev 2588)
@@ -32,7 +32,7 @@
#save the image file
if cd.get('graphics'):
- f = file('incoming/%s' % cd['graphics'].filename, 'wb')
+ f = file('/var/www/images/%s' % cd['graphics'].filename, 'wb')
f.write(cd['graphics'].content)
f.close()
cd['graphics'] = cd['graphics'].filename
@@ -43,7 +43,7 @@
sub.text = str(cd[v])
tree = ET.ElementTree(root)
- tree.write("incoming/%s.xml" % uniq)
+ tree.write("/var/www/templates/%s.xml" % uniq)
return HttpResponseRedirect("/template/%s.xml/" % uniq )
else:
form = BuildForm()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-11-07 23:19:30
|
Revision: 2587
http://morphix.svn.sourceforge.net/morphix/?rev=2587&view=rev
Author: bmsleight
Date: 2007-11-07 15:19:24 -0800 (Wed, 07 Nov 2007)
Log Message:
-----------
I am starting to like django
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/urls.py
trunk/morphixlivekiosk/scripts/mbuild/web/models.py
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
trunk/morphixlivekiosk/scripts/mbuild/templates/template.html
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/emailnotify.html 2007-11-07 23:19:24 UTC (rev 2587)
@@ -0,0 +1,3 @@
+<h1>Custom Built Kiosk LiveCD</h1>
+
+<p>Will email {{ emailnotify }} when the elves have built the kiosk.<p>
\ No newline at end of file
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/template.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/template.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/template.html 2007-11-07 23:19:24 UTC (rev 2587)
@@ -0,0 +1,9 @@
+<h1>Custom Built Kiosk LiveCD</h1>
+<p>Template {{ template }} is added to the queue to be built<p>
+
+<p>We can email you when the Kiosk has been built.<p>
+<form enctype="multipart/form-data" method="post" action=".">
+ {{ form.as_p }}
+
+ <p><input type="submit" value="Notify →"></p>
+</form>
Modified: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-04 15:42:24 UTC (rev 2586)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-07 23:19:24 UTC (rev 2587)
@@ -2,6 +2,7 @@
urlpatterns = patterns('',
(r'^$', 'mbuild.web.views.index'),
+ (r'^template/(?P<template>[^/]+)/', 'mbuild.web.views.template'),
# Uncomment this for admin:
# (r'^admin/', include('django.contrib.admin.urls')),
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/models.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-04 15:42:24 UTC (rev 2586)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-07 23:19:24 UTC (rev 2587)
@@ -1,3 +1,10 @@
from django.db import models
# Create your models here.
+
+class Queue(models.Model):
+ template = models.CharField(maxlength="20", primary_key=True)
+ brand = models.CharField(maxlength="20")
+ built = models.BooleanField(default=False,
+ help_text="Has Kiosk been built")
+ notifybyemail = models.EmailField(null=True)
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-04 15:42:24 UTC (rev 2586)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-07 23:19:24 UTC (rev 2587)
@@ -2,6 +2,8 @@
from django.template import RequestContext
from django import newforms as forms
from django.http import HttpResponse
+from django.http import HttpResponseRedirect
+from mbuild.web.models import Queue
import datetime, time
import elementtree.ElementTree as ET
@@ -9,9 +11,9 @@
def index(request):
class BuildForm(forms.Form):
- brand_name = forms.CharField(max_length=150, required=True, label="What Brand would you like to use?")
+ brand_name = forms.CharField(max_length=150, required=True, label="What Brand name would you like to use?")
graphics = forms.ImageField(required=False, label="Graphics file (1024x768, 32pps, any format works best)")
- homepage = forms.CharField(max_length=150, required=True, label="Desired homepage")
+ homepage = forms.CharField(max_length=150, required=True, label="Desired homepage http://")
nav_bar = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
initial=True, label="Should the Navigation Bar be visable?")
dhcp = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
@@ -42,10 +44,23 @@
tree = ET.ElementTree(root)
tree.write("incoming/%s.xml" % uniq)
- return HttpResponse("The Elves have started preparing your LiveCD.")
+ return HttpResponseRedirect("/template/%s.xml/" % uniq )
else:
form = BuildForm()
context = {'form': form}
return render_to_response('index.html', context,
- context_instance=RequestContext(request))
\ No newline at end of file
+ context_instance=RequestContext(request))
+
+def template(request, template):
+ class BuildForm(forms.Form):
+ emailnotify = forms.EmailField("Email to recieve notifications?")
+ if request.POST:
+ emailnotify = request.POST["emailnotify"]
+ return render_to_response("emailnotify.html",{"emailnotify":emailnotify})
+ else:
+ form = BuildForm()
+ context = {'form': form}
+ return render_to_response('index.html', context,
+ context_instance=RequestContext(request))
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-11-04 15:42:28
|
Revision: 2586
http://morphix.svn.sourceforge.net/morphix/?rev=2586&view=rev
Author: bmsleight
Date: 2007-11-04 07:42:24 -0800 (Sun, 04 Nov 2007)
Log Message:
-----------
Generate a Preview.jpg for the ultra-lazy.
Modified Paths:
--------------
trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
Modified: trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh
===================================================================
--- trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh 2007-11-02 22:59:50 UTC (rev 2585)
+++ trunk/mmaker/utils/auto-testing/video-qemu-booting-iso.sh 2007-11-04 15:42:24 UTC (rev 2586)
@@ -174,6 +174,41 @@
vncrec -movie $TMP_DIR/qemu.1.vnc | ffmpeg2theora $FFMPEG_DIM_SCALE --videoquality $VQUALITY --inputfps 40 --artist "AutoTesting" --title "Video of Qemu booting $ISO" --date "$TODAY" -o $VIDEO -
}
+gen_video_preview ()
+{
+MONTAGE_DIR=/tmp/tp.$$.dir.montage
+mkdir $MONTAGE_DIR
+ffmpeg -i $VIDEO -vcodec copy $TMP_DIR/duration.ogg 2>$TMP_DIR/ffmpeg.log
+DURATION_H=$(cat $TMP_DIR/ffmpeg.log | grep Duration | cut -d ' ' -f 4 | sed s/,// | cut -d ':' -f 1)
+DURATION_M=$(cat $TMP_DIR/ffmpeg.log | grep Duration | cut -d ' ' -f 4 | sed s/,// | cut -d ':' -f 2)
+DURATION_S=$(cat $TMP_DIR/ffmpeg.log | grep Duration | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/,// | cut -d ':' -f 3)
+LENGTH=$(($DURATION_H*3600+$DURATION_M*60+$DURATION_S))
+echo $LENGTH $DURATION_H $DURATION_M $DURATION_S
+COUNTER=0
+END=5
+COUNT=1
+# Generate a Frame every 0.5 secs for the start of the video
+while [ $COUNTER -lt $END ]; do
+ HALFSECS=$(echo $COUNTER/2|bc -l)
+ ffmpeg -i $VIDEO -an -ss $HALFSECS -t 01 -r 1 -y -s 320x240 $TMP_DIR/video%d.jpg 2>/dev/null
+ mv $TMP_DIR/video1.jpg $MONTAGE_DIR/$COUNT.jpg
+ LIST="$LIST $MONTAGE_DIR/$COUNT.jpg"
+ let COUNT=COUNT+1
+ let COUNTER=COUNTER+1
+done
+SPLIT=$(($LENGTH/12))
+COUNTER="$SPLIT"
+while [ $COUNTER -lt $LENGTH ]; do
+ ffmpeg -i $VIDEO -an -ss $COUNTER -t 01 -r 1 -y $TMP_DIR/video%d.jpg 2>/dev/null
+ mv $TMP_DIR/video1.jpg $MONTAGE_DIR/$COUNT.jpg
+ LIST="$LIST $MONTAGE_DIR/$COUNT.jpg"
+ let COUNT=COUNT+1
+ let COUNTER=$(($COUNTER+$SPLIT))
+done
+montage -geometry 180x135+4+4 -frame 5 $LIST $VIDEO.jpg
+rm -R $MONTAGE_DIR
+}
+
clean_up ()
{
DISPLAY="$OLD_DISPLAY"
@@ -183,7 +218,7 @@
}
-while getopts s:p:g:d:t:v:q: opt
+while getopts s:p:g:d:t:v:q:n opt
do
case "$opt" in
s) SENDKEYS="$OPTARG";;
@@ -193,18 +228,19 @@
t) TIME_Q="$OPTARG";;
v) VQUALITY="$OPTARG";;
q) QEMU_BIN="$OPTARG";;
+ n) NOPREVIEW="true";;
\?) # unknown flag
echo >&2 \
- "usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-v (0 to 10) encoding quality for video] [-q alternative qemu binary name] IsoToTest.iso Video.ogg "
+ "usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-v (0 to 10) encoding quality for video] [-q alternative qemu binary name] [-n] IsoToTest.iso Video.ogg "
exit 1;;
esac
done
shift `expr $OPTIND - 1`
if [ -z "$1" -a -z "$2" ]; then
- echo "usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-v (0 to 10) encoding quality for video] [-q alternative qemu binary name] IsoToTest.iso Video.ogg "
+ echo "usage: $0 [-s \"keys,to,send,to,qemu\"] [-p port_number for qemu-monitor] [-g geometry of vncsession] [-d dimensions of video] [-t time to run qemu] [-v (0 to 10) encoding quality for video] [-q alternative qemu binary name] [-n Do not gernerate a preview of the video.ogg.jpg] IsoToTest.iso Video.ogg "
echo
echo " This script boots a livecd using qemu and records a video of the process. "
echo
@@ -232,5 +268,10 @@
let_qemu_run
stop_qemu
gen_video
+if [ "$NOPREVIEW" = "true" ]; then
+ echo "Skipping jpg preview"
+else
+ gen_video_preview
+fi
stop_vncservers
clean_up
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gan...@us...> - 2007-11-02 22:59:53
|
Revision: 2585
http://morphix.svn.sourceforge.net/morphix/?rev=2585&view=rev
Author: gandalfar
Date: 2007-11-02 15:59:50 -0700 (Fri, 02 Nov 2007)
Log Message:
-----------
added the images part
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-02 22:38:32 UTC (rev 2584)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-02 22:59:50 UTC (rev 2585)
@@ -1,6 +1,6 @@
<h1>Custom Built Kiosk LiveCD</h1>
-<form action="." method="post" accept-charset="utf-8">
+<form enctype="multipart/form-data" method="post" action=".">
{{ form.as_p }}
<p><input type="submit" value="Continue →"></p>
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-02 22:38:32 UTC (rev 2584)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-02 22:59:50 UTC (rev 2585)
@@ -9,9 +9,9 @@
def index(request):
class BuildForm(forms.Form):
- brand_name = forms.CharField(max_length=150, required=True)
- graphics = forms.ImageField(required=False)
- homepage = forms.CharField(max_length=150, required=True)
+ brand_name = forms.CharField(max_length=150, required=True, label="What Brand would you like to use?")
+ graphics = forms.ImageField(required=False, label="Graphics file (1024x768, 32pps, any format works best)")
+ homepage = forms.CharField(max_length=150, required=True, label="Desired homepage")
nav_bar = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
initial=True, label="Should the Navigation Bar be visable?")
dhcp = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
@@ -22,12 +22,19 @@
label="Include Java?", initial=False)
if request.POST:
- form = BuildForm(request.POST.copy())
+ form = BuildForm(request.POST, request.FILES)
if form.is_valid():
dt = datetime.datetime.now()
uniq = time.mktime(dt.timetuple()) + dt.microsecond/1e6
cd = form.cleaned_data
+ #save the image file
+ if cd.get('graphics'):
+ f = file('incoming/%s' % cd['graphics'].filename, 'wb')
+ f.write(cd['graphics'].content)
+ f.close()
+ cd['graphics'] = cd['graphics'].filename
+
root = ET.Element("LIVECD")
for v in cd:
sub = ET.SubElement(root, v)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gan...@us...> - 2007-11-02 22:38:35
|
Revision: 2584
http://morphix.svn.sourceforge.net/morphix/?rev=2584&view=rev
Author: gandalfar
Date: 2007-11-02 15:38:32 -0700 (Fri, 02 Nov 2007)
Log Message:
-----------
XML generating part, missing just the graphics
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-02 22:28:44 UTC (rev 2583)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-02 22:38:32 UTC (rev 2584)
@@ -1,6 +1,7 @@
from django.shortcuts import render_to_response
from django.template import RequestContext
from django import newforms as forms
+from django.http import HttpResponse
import datetime, time
import elementtree.ElementTree as ET
@@ -25,8 +26,16 @@
if form.is_valid():
dt = datetime.datetime.now()
uniq = time.mktime(dt.timetuple()) + dt.microsecond/1e6
+ cd = form.cleaned_data
- print uniq
+ root = ET.Element("LIVECD")
+ for v in cd:
+ sub = ET.SubElement(root, v)
+ sub.text = str(cd[v])
+
+ tree = ET.ElementTree(root)
+ tree.write("incoming/%s.xml" % uniq)
+ return HttpResponse("The Elves have started preparing your LiveCD.")
else:
form = BuildForm()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gan...@us...> - 2007-11-02 22:28:46
|
Revision: 2583
http://morphix.svn.sourceforge.net/morphix/?rev=2583&view=rev
Author: gandalfar
Date: 2007-11-02 15:28:44 -0700 (Fri, 02 Nov 2007)
Log Message:
-----------
README and some more code
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/mbuild/README
Added: trunk/morphixlivekiosk/scripts/mbuild/README
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/README (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/README 2007-11-02 22:28:44 UTC (rev 2583)
@@ -0,0 +1,3 @@
+You need python2.4+ and Django trunk to run this.
+
+Run `python manage.py syncdb` to generate the .db file
\ No newline at end of file
Modified: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-02 22:14:44 UTC (rev 2582)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-02 22:28:44 UTC (rev 2583)
@@ -1,3 +1,5 @@
+<h1>Custom Built Kiosk LiveCD</h1>
+
<form action="." method="post" accept-charset="utf-8">
{{ form.as_p }}
Modified: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-02 22:14:44 UTC (rev 2582)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-02 22:28:44 UTC (rev 2583)
@@ -2,25 +2,31 @@
from django.template import RequestContext
from django import newforms as forms
+import datetime, time
+import elementtree.ElementTree as ET
+
+
def index(request):
class BuildForm(forms.Form):
brand_name = forms.CharField(max_length=150, required=True)
graphics = forms.ImageField(required=False)
homepage = forms.CharField(max_length=150, required=True)
nav_bar = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
- initial=True)
+ initial=True, label="Should the Navigation Bar be visable?")
dhcp = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
- initial=True)
+ initial=True, label="Use DHCP?")
flash = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
label="Include Flash?", initial=False)
java = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
label="Include Java?", initial=False)
-
if request.POST:
form = BuildForm(request.POST.copy())
if form.is_valid():
- pass
+ dt = datetime.datetime.now()
+ uniq = time.mktime(dt.timetuple()) + dt.microsecond/1e6
+
+ print uniq
else:
form = BuildForm()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gan...@us...> - 2007-11-02 22:14:50
|
Revision: 2582
http://morphix.svn.sourceforge.net/morphix/?rev=2582&view=rev
Author: gandalfar
Date: 2007-11-02 15:14:44 -0700 (Fri, 02 Nov 2007)
Log Message:
-----------
initial mbuild commit
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/mbuild/
trunk/morphixlivekiosk/scripts/mbuild/__init__.py
trunk/morphixlivekiosk/scripts/mbuild/incoming/
trunk/morphixlivekiosk/scripts/mbuild/manage.py
trunk/morphixlivekiosk/scripts/mbuild/media/
trunk/morphixlivekiosk/scripts/mbuild/settings.py
trunk/morphixlivekiosk/scripts/mbuild/templates/
trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
trunk/morphixlivekiosk/scripts/mbuild/urls.py
trunk/morphixlivekiosk/scripts/mbuild/web/
trunk/morphixlivekiosk/scripts/mbuild/web/__init__.py
trunk/morphixlivekiosk/scripts/mbuild/web/models.py
trunk/morphixlivekiosk/scripts/mbuild/web/views.py
Added: trunk/morphixlivekiosk/scripts/mbuild/__init__.py
===================================================================
Added: trunk/morphixlivekiosk/scripts/mbuild/manage.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/manage.py (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/manage.py 2007-11-02 22:14:44 UTC (rev 2582)
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+from django.core.management import execute_manager
+try:
+ import settings # Assumed to be in the same directory.
+except ImportError:
+ import sys
+ sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
+ sys.exit(1)
+
+if __name__ == "__main__":
+ execute_manager(settings)
Property changes on: trunk/morphixlivekiosk/scripts/mbuild/manage.py
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/morphixlivekiosk/scripts/mbuild/settings.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/settings.py (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/settings.py 2007-11-02 22:14:44 UTC (rev 2582)
@@ -0,0 +1,84 @@
+# Django settings for mbuild project.
+import os
+here = lambda x: os.path.join(os.path.dirname(__file__),x)
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+ # ('Your Name', 'you...@do...'),
+)
+
+MANAGERS = ADMINS
+
+DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = here('mbuild.db') # Or path to database file if using sqlite3.
+DATABASE_USER = '' # Not used with sqlite3.
+DATABASE_PASSWORD = '' # Not used with sqlite3.
+DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
+
+# Local time zone for this installation. Choices can be found here:
+# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
+# although not all choices may be avilable on all operating systems.
+# If running in a Windows environment this must be set to the same as your
+# system time zone.
+TIME_ZONE = 'Europe/London'
+
+# Language code for this installation. All choices can be found here:
+# http://www.i18nguy.com/unicode/language-identifiers.html
+LANGUAGE_CODE = 'en-us'
+
+SITE_ID = 1
+
+# If you set this to False, Django will make some optimizations so as not
+# to load the internationalization machinery.
+USE_I18N = True
+
+# Absolute path to the directory that holds media.
+# Example: "/home/media/media.lawrence.com/"
+MEDIA_ROOT = here('media/')
+
+# URL that handles the media served from MEDIA_ROOT. Make sure to use a
+# trailing slash if there is a path component (optional in other cases).
+# Examples: "http://media.lawrence.com", "http://example.com/media/"
+MEDIA_URL = ''
+
+# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
+# trailing slash.
+# Examples: "http://foo.com/media/", "/media/".
+ADMIN_MEDIA_PREFIX = '/media/'
+
+# Make this unique, and don't share it with anybody.
+SECRET_KEY = 'r%v55owvj@9mn-3zj+8f5&an)b1d+7pzd(im=vf+^bij+*1cpk'
+
+# List of callables that know how to import templates from various sources.
+TEMPLATE_LOADERS = (
+ 'django.template.loaders.filesystem.load_template_source',
+ 'django.template.loaders.app_directories.load_template_source',
+# 'django.template.loaders.eggs.load_template_source',
+)
+
+MIDDLEWARE_CLASSES = (
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.middleware.doc.XViewMiddleware',
+)
+
+ROOT_URLCONF = 'mbuild.urls'
+
+TEMPLATE_DIRS = (
+ # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
+ # Always use forward slashes, even on Windows.
+ # Don't forget to use absolute paths, not relative paths.
+ here('templates'),
+)
+
+INSTALLED_APPS = (
+ 'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+ 'mbuild.web',
+)
Added: trunk/morphixlivekiosk/scripts/mbuild/templates/index.html
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/templates/index.html (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/templates/index.html 2007-11-02 22:14:44 UTC (rev 2582)
@@ -0,0 +1,5 @@
+<form action="." method="post" accept-charset="utf-8">
+ {{ form.as_p }}
+
+ <p><input type="submit" value="Continue →"></p>
+</form>
Added: trunk/morphixlivekiosk/scripts/mbuild/urls.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/urls.py (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/urls.py 2007-11-02 22:14:44 UTC (rev 2582)
@@ -0,0 +1,9 @@
+from django.conf.urls.defaults import *
+
+urlpatterns = patterns('',
+ (r'^$', 'mbuild.web.views.index'),
+
+ # Uncomment this for admin:
+# (r'^admin/', include('django.contrib.admin.urls')),
+
+)
Added: trunk/morphixlivekiosk/scripts/mbuild/web/__init__.py
===================================================================
Added: trunk/morphixlivekiosk/scripts/mbuild/web/models.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/models.py (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/models.py 2007-11-02 22:14:44 UTC (rev 2582)
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
Added: trunk/morphixlivekiosk/scripts/mbuild/web/views.py
===================================================================
--- trunk/morphixlivekiosk/scripts/mbuild/web/views.py (rev 0)
+++ trunk/morphixlivekiosk/scripts/mbuild/web/views.py 2007-11-02 22:14:44 UTC (rev 2582)
@@ -0,0 +1,29 @@
+from django.shortcuts import render_to_response
+from django.template import RequestContext
+from django import newforms as forms
+
+def index(request):
+ class BuildForm(forms.Form):
+ brand_name = forms.CharField(max_length=150, required=True)
+ graphics = forms.ImageField(required=False)
+ homepage = forms.CharField(max_length=150, required=True)
+ nav_bar = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
+ initial=True)
+ dhcp = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
+ initial=True)
+ flash = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
+ label="Include Flash?", initial=False)
+ java = forms.BooleanField(widget=forms.RadioSelect(choices=[(True, 'Yes'), (False, 'No')]),
+ label="Include Java?", initial=False)
+
+
+ if request.POST:
+ form = BuildForm(request.POST.copy())
+ if form.is_valid():
+ pass
+ else:
+ form = BuildForm()
+
+ context = {'form': form}
+ return render_to_response('index.html', context,
+ context_instance=RequestContext(request))
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-11-01 21:22:20
|
Revision: 2581
http://morphix.svn.sourceforge.net/morphix/?rev=2581&view=rev
Author: bmsleight
Date: 2007-11-01 14:22:01 -0700 (Thu, 01 Nov 2007)
Log Message:
-----------
Testing is good
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/kabt.sh
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-31 00:16:32 UTC (rev 2580)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-11-01 21:22:01 UTC (rev 2581)
@@ -117,11 +117,11 @@
mv $TMP_FILE $TMP_DIR/$MINIPRE
sed -e s/COMMENTOUTNAVBAR/$COMMENT_OUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
mv $TMP_FILE $TMP_DIR/$MINIPRE
-sed -e s/HOMEPAGE/$HOMEPAGE/g $TMP_DIR/$MINIPRE >$TMP_FILE
+sed -e "s^HOMEPAGE^$HOMEPAGE^g" $TMP_DIR/$MINIPRE >$TMP_FILE
mv $TMP_FILE $TMP_DIR/$MINIPRE
sed -e s/BRANDNAME/$BRAND/g $TMP_DIR/$MINIPRE >$TMP_FILE
mv $TMP_FILE $TMP_DIR/$MINIPRE
-if [ "$DHCP" = "true" ]; then
+if [ "$DHCP" = "dhcp" ]; then
NETWORKCOMMANDS="<command>dhclient<\/command>"
else
NETWORKCOMMANDS="<\!--BlankNetworkSettings-->"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-31 00:16:34
|
Revision: 2580
http://morphix.svn.sourceforge.net/morphix/?rev=2580&view=rev
Author: bmsleight
Date: 2007-10-30 17:16:32 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
Opps homepage ?
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/index.pl
Modified: trunk/morphixlivekiosk/scripts/index.pl
===================================================================
--- trunk/morphixlivekiosk/scripts/index.pl 2007-10-31 00:13:58 UTC (rev 2579)
+++ trunk/morphixlivekiosk/scripts/index.pl 2007-10-31 00:16:32 UTC (rev 2580)
@@ -143,7 +143,7 @@
$xml1 = " <version>0.0.1</version>"
. " <brand>" . $brand . "</brand>"
. " <graphic>" . $domain . $file . "</graphic>"
- . " <homepage>" . $homepage . "</homepage>";
+ . " <homepage>" . $homepage . "</homepage>"
. " <navbar>" . $navbar . "</navbar>";
$xmlmini = " <extralist>";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-31 00:14:00
|
Revision: 2579
http://morphix.svn.sourceforge.net/morphix/?rev=2579&view=rev
Author: bmsleight
Date: 2007-10-30 17:13:58 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
Opps homepage ?
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/index.pl
Modified: trunk/morphixlivekiosk/scripts/index.pl
===================================================================
--- trunk/morphixlivekiosk/scripts/index.pl 2007-10-30 23:44:27 UTC (rev 2578)
+++ trunk/morphixlivekiosk/scripts/index.pl 2007-10-31 00:13:58 UTC (rev 2579)
@@ -46,7 +46,7 @@
# There might be a nice perl way - but some times bash is nice
print p("Removed $urls from queue");
- system "echo \"$message\" | mail -s 'Custom Built Kiosk LiveCD' $emails -- -r bu...@li... -";
+ system "echo \"$message\" | mail -s 'Custom Built Kiosk LiveCD' $emails -b bm...@ba... -- -r bu...@li... -";
system "cat $templatequeue | tail -n+2 >$templatequeue ";
}
elsif (param("queue")) {
@@ -143,6 +143,7 @@
$xml1 = " <version>0.0.1</version>"
. " <brand>" . $brand . "</brand>"
. " <graphic>" . $domain . $file . "</graphic>"
+ . " <homepage>" . $homepage . "</homepage>";
. " <navbar>" . $navbar . "</navbar>";
$xmlmini = " <extralist>";
@@ -188,7 +189,7 @@
-values=>['dhcp'],
-default=>'dhcp'));
- print p("Extras to inlcude ? ", checkbox_group(-name=>'minis',
+ print p("Extras to include ? ", checkbox_group(-name=>'minis',
-values=>['MorphixMini-NonFree-FlashPlugin.xml','MorphixMini-NonFree-Java.xml'],
-defaults=>[''],
-multiple=>'true'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-30 23:44:31
|
Revision: 2578
http://morphix.svn.sourceforge.net/morphix/?rev=2578&view=rev
Author: bmsleight
Date: 2007-10-30 16:44:27 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
Any testers ?
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/index.pl
trunk/morphixlivekiosk/scripts/kabt.sh
Modified: trunk/morphixlivekiosk/scripts/index.pl
===================================================================
--- trunk/morphixlivekiosk/scripts/index.pl 2007-10-30 22:19:33 UTC (rev 2577)
+++ trunk/morphixlivekiosk/scripts/index.pl 2007-10-30 23:44:27 UTC (rev 2578)
@@ -20,22 +20,7 @@
close(OUT);
}
-
-if (param("queue")) {
- print "Content-type: text/html\n\n";
-
- open(DAT, $templatequeue) || die("Could not open file!");
- @raw_data=<DAT>;
- close(DAT);
-
- foreach $queue (@raw_data)
- {
- chop($queue);
- ($urls,$emails)=split(/\|/,$queue);
- print "$urls\n";
- }
-}
-elsif (param("built")) {
+if (param("built")) {
print header, start_html("Custom Built Kiosk LiveCD"), h1("Custom Built Kiosk LiveCD");
$built = param("built");
$video = param("v");
@@ -43,11 +28,11 @@
print p("$built/$video \n");
print p("$built/$iso \n");
$message = "Your custom built Kiosk LiveCD is ready. \n"
- . "Please download and view the AutoTesting video first. \n "
+ . "Please download and view the AutoTesting video first. \n"
. "The video will show how successful the build was and can save "
. "vital bandwidth if the build did not go well. \n\n"
- . "Video - http://$built/$video \n"
- . "ISO - http://$built/$iso \n"
+ . "Video - $built/$video \n"
+ . "ISO - $built/$iso \n"
. "\n"
. "Enjoy Your Kiosk - kiosk.liveCD.org";
open(DAT, $templatequeue) || die("Could not open file!");
@@ -64,6 +49,20 @@
system "echo \"$message\" | mail -s 'Custom Built Kiosk LiveCD' $emails -- -r bu...@li... -";
system "cat $templatequeue | tail -n+2 >$templatequeue ";
}
+elsif (param("queue")) {
+ print "Content-type: text/html\n\n";
+
+ open(DAT, $templatequeue) || die("Could not open file!");
+ @raw_data=<DAT>;
+ close(DAT);
+
+ foreach $queue (@raw_data)
+ {
+ chop($queue);
+ ($urls,$emails)=split(/\|/,$queue);
+ print "$urls\n";
+ }
+}
else {
#
# Start by printing the content-type, the title of the web page and a heading.
@@ -169,15 +168,16 @@
print p("Templates successfully created : <a href='$templateurl" . ">" . "$brand" . "</a>");
print start_form();
print p("Template will be added to the queue to be built.");
- print p("Once built, we will email the links contain the AutoTest Video and the iso to download");
+ print p("Once built, we will email the links containing the AutoTest Video and the iso to download");
print p("Email Address: ", textfield(-name=>"email", -size=>30), hidden(-name=>'url', -default=> $templateurl ) );
print p(submit("Build!"));
+ print p("Builds are run from the queue of builds at 1500, 1800 and 2100 GMT daily");
print end_form();
}
else { # Else, first time through so present form.
print start_form();
print p("What is the Brand Name (e.g. MorphixLiveKiosk) ? ", textfield("brand"));
- print p("Graphics file used from logo and backgrounds ? ", filefield(-name=>'graphic',
+ print p("Graphics file used for logo and backgrounds ? ", filefield(-name=>'graphic',
-size=>30,
-maxlength=>80));
print p("What is the Homepage URL (e.g. www.morphix.org) ? ", textfield("homepage"));
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-30 22:19:33 UTC (rev 2577)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-30 23:44:27 UTC (rev 2578)
@@ -234,8 +234,8 @@
CALLWLOGG=$(cut -d\ -f2 $TMP_DIR/build-list.txt)
CALLWLISOBN=$(basename $CALLWLISO)
CALLWLOGGBN=$(basename $CALLWLOGG)
- CALLWL="${EXTERNALURL}&b=${CALLWLISOBN}&v=${CALLWLOGGBN}"
- echo wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
+ CALLWL="${QUEUEURL}&built=${EXTERNALURL}&v=${CALLWLOGGBN}&i=${CALLWLISOBN}"
+ wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
fi
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-30 22:19:39
|
Revision: 2577
http://morphix.svn.sourceforge.net/morphix/?rev=2577&view=rev
Author: bmsleight
Date: 2007-10-30 15:19:33 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
A example front end to prove concept.
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/index.pl
Added: trunk/morphixlivekiosk/scripts/index.pl
===================================================================
--- trunk/morphixlivekiosk/scripts/index.pl (rev 0)
+++ trunk/morphixlivekiosk/scripts/index.pl 2007-10-30 22:19:33 UTC (rev 2577)
@@ -0,0 +1,201 @@
+#!/usr/bin/perl -w
+
+use CGI qw(:standard); # Include standard HTML and CGI functions
+use CGI::Carp qw(fatalsToBrowser); # Send error messages to browser
+
+$dir = "/var/local/www/templates/";
+$imagestore ="/var/www/morphix/livekiosk/webservice/images/";
+$templatestore ="/var/www/morphix/livekiosk/webservice/templates/";
+$templatequeue ="/var/local/www/templates/queue.txt";
+$queuecomplete ="/var/local/www/templates/completed.txt";
+$lockfile ="/var/local/www/templates/lock_the_file.loc";
+$domain = "http://www.barwap.com/morphix/livekiosk/webservice/images/";
+$templatestoredomain = "http://www.barwap.com/morphix/livekiosk/webservice/templates/";
+
+
+sub WriteStringToFile {
+ my ($file, $string) = @_;
+ open (OUT, ">$file") or die('cant write %s', $file) ;
+ print OUT $string;
+ close(OUT);
+}
+
+
+if (param("queue")) {
+ print "Content-type: text/html\n\n";
+
+ open(DAT, $templatequeue) || die("Could not open file!");
+ @raw_data=<DAT>;
+ close(DAT);
+
+ foreach $queue (@raw_data)
+ {
+ chop($queue);
+ ($urls,$emails)=split(/\|/,$queue);
+ print "$urls\n";
+ }
+}
+elsif (param("built")) {
+ print header, start_html("Custom Built Kiosk LiveCD"), h1("Custom Built Kiosk LiveCD");
+ $built = param("built");
+ $video = param("v");
+ $iso = param("i");
+ print p("$built/$video \n");
+ print p("$built/$iso \n");
+ $message = "Your custom built Kiosk LiveCD is ready. \n"
+ . "Please download and view the AutoTesting video first. \n "
+ . "The video will show how successful the build was and can save "
+ . "vital bandwidth if the build did not go well. \n\n"
+ . "Video - http://$built/$video \n"
+ . "ISO - http://$built/$iso \n"
+ . "\n"
+ . "Enjoy Your Kiosk - kiosk.liveCD.org";
+ open(DAT, $templatequeue) || die("Could not open file!");
+ $topqueue = <DAT>;
+ close(DAT);
+ ($urls,$emails)=split(/\|/,$topqueue);
+ print h2("$emails");
+ print h2("$urls");
+ print p("$message");
+ print end_html;
+ # There might be a nice perl way - but some times bash is nice
+ print p("Removed $urls from queue");
+
+ system "echo \"$message\" | mail -s 'Custom Built Kiosk LiveCD' $emails -- -r bu...@li... -";
+ system "cat $templatequeue | tail -n+2 >$templatequeue ";
+}
+else {
+#
+# Start by printing the content-type, the title of the web page and a heading.
+#
+#
+ print header, start_html("Custom Built Kiosk LiveCD"), h1("Custom Built Kiosk LiveCD");
+ if (param("email")) { # If true, the form has already been filled out.
+ $email = param("email");
+ $url = param("url");
+
+ $flag = "false";
+ open(DAT, $templatequeue) || die("Could not open file!");
+ @raw_data=<DAT>;
+ close(DAT);
+
+ foreach $queue (@raw_data)
+ {
+ chop($queue);
+ ($urls,$emails)=split(/\|/,$queue);
+ if ( $urls eq $url) {
+ $flag = "true";
+ }
+ }
+
+ if ( $flag eq "false" ) {
+ # This checks for the existence of the lock file.
+ # If it exists, we use the sleep command to wait two seconds and try again.
+ while (-e $lockfile) {
+ sleep 2;
+ }
+ # If we get past the while loop, we can now create a lock file to
+ # keep others out until we have written to the file.
+ open (LOCK,">$lockfile") || die ("Cannot open lock file!\n");
+ close (LOCK);
+
+ print p("Email: $email");
+ print p("Template: $url");
+
+ # Open and write to the data file
+ open(DAT,">>$templatequeue") || die("Cannot Open File");
+ print DAT "$url\|$email\n";
+ close(DAT);
+ print p("Template added to queue");
+
+ # Now that writing is done, delete the lock file
+ # to allow others to access the data file
+ unlink($lockfile);
+ }
+ else {
+ print p("Template already in queue");
+ }
+ }
+ elsif (param('graphic')) {
+ $brand = param("brand"); # Extract the value passed from the form.
+ $homepage = param("homepage"); # Extract the value passed from the form.
+ $navbar = param("navbar"); # Extract the value passed from the form.
+ $network = param("network");
+
+ print p("Brand: $brand"); # Print the name.
+ print p("Homepage: $homepage"); # Print the name.
+ print p("Navigation: $navbar"); # Print the name.
+
+ $file = param('graphic');
+ @minis = param('minis');
+ $file=~m/^.*(\\|\/)(.*)/; # strip the remote path and keep the filename
+ open(LOCAL, ">$dir/$file") or die $!;
+ while(<$file>) {
+ print LOCAL $_;
+ }
+ print "$file has been successfully uploaded... thank you.\n";
+
+ #Use convert o amke sure that Imgae upload is an real image not a naughty script
+ system "convert $dir/$file /var/www/morphix/livekiosk/webservice/images/$file";
+
+ $xml = "<comps>"
+ . " <group>"
+ . " <kiosk>";
+ $xml1 = " <version>0.0.1</version>"
+ . " <brand>" . $brand . "</brand>"
+ . " <graphic>" . $domain . $file . "</graphic>"
+ . " <navbar>" . $navbar . "</navbar>";
+
+ $xmlmini = " <extralist>";
+ foreach $mini (@minis) {
+ $xmlmini = $xmlmini . "<MiniModule>" . $mini . "</MiniModule>";
+ }
+ $xmlmini = $xmlmini . " </extralist>";
+
+ $xmlnet = " <network>"
+ . " <dhcp>$network</dhcp>"
+ . " </network>";
+
+ $xmlend = " </kiosk>"
+ . " </group>"
+ . "</comps>";
+
+ $xmllfinished = $xml . $xml1 . $xmlmini . $xmlnet . $xmlend;
+# $templatestore
+ my ($sec, $min, $hour, $mday, $mon, $year) = localtime(time);
+ $xmlname= "$brand" . "_date_" . "$mon" . "-" . "$mday" . "_" . "IP_" . $ENV{'REMOTE_ADDR'} . ".xml" ;
+ $templateurl=$templatestoredomain . $xmlname;
+ WriteStringToFile( $templatestore . $xmlname , $xmllfinished );
+ print p("Templates successfully created : <a href='$templateurl" . ">" . "$brand" . "</a>");
+ print start_form();
+ print p("Template will be added to the queue to be built.");
+ print p("Once built, we will email the links contain the AutoTest Video and the iso to download");
+ print p("Email Address: ", textfield(-name=>"email", -size=>30), hidden(-name=>'url', -default=> $templateurl ) );
+ print p(submit("Build!"));
+ print end_form();
+ }
+ else { # Else, first time through so present form.
+ print start_form();
+ print p("What is the Brand Name (e.g. MorphixLiveKiosk) ? ", textfield("brand"));
+ print p("Graphics file used from logo and backgrounds ? ", filefield(-name=>'graphic',
+ -size=>30,
+ -maxlength=>80));
+ print p("What is the Homepage URL (e.g. www.morphix.org) ? ", textfield("homepage"));
+ print p("Should the Navigation Bar be visable ? ", radio_group(-name=>'navbar',
+ -values=>['true','false'],
+ -default=>'true'));
+ print p("Should the network use DHCP or static ? ", radio_group(-name=>'network',
+ -values=>['dhcp'],
+ -default=>'dhcp'));
+
+ print p("Extras to inlcude ? ", checkbox_group(-name=>'minis',
+ -values=>['MorphixMini-NonFree-FlashPlugin.xml','MorphixMini-NonFree-Java.xml'],
+ -defaults=>[''],
+ -multiple=>'true'));
+ print p(submit("Submit"));
+ print end_form();
+ }
+ print end_html;
+}
+
+
Property changes on: trunk/morphixlivekiosk/scripts/index.pl
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-24 21:42:42
|
Revision: 2576
http://morphix.svn.sourceforge.net/morphix/?rev=2576&view=rev
Author: bmsleight
Date: 2007-10-24 14:42:40 -0700 (Wed, 24 Oct 2007)
Log Message:
-----------
kabt.sh working
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/kabt.sh
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-23 22:45:16 UTC (rev 2575)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-24 21:42:40 UTC (rev 2576)
@@ -93,7 +93,7 @@
HOMEPAGE="$RETURN_VALUE"
xml_get "//kiosk" "navbar" "navbar" $TEMPLATE
NAVBAR="$RETURN_VALUE"
-xml_get_tmp "//kiosk/network" "dhcp" "dhcp" $TEMPLATE
+xml_get "//kiosk/network" "dhcp" "dhcp" $TEMPLATE
DHCP="$RETURN_VALUE"
xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE
EXTRAMINIS=$(cat $TMP_FILE)
@@ -182,7 +182,7 @@
if [ "$NOTESTING" = "true" ]; then
echo "Not testing the built iso"
else
- echo video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 600 -g 1024x768 -s "spc,spc,kp_enter" $OUTPUT.iso $OUTPUT.ogg
+ video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 800 -g 1024x768 -s "spc,spc,kp_enter" $OUTPUT.iso $OUTPUT.ogg
fi
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-23 22:45:21
|
Revision: 2575
http://morphix.svn.sourceforge.net/morphix/?rev=2575&view=rev
Author: bmsleight
Date: 2007-10-23 15:45:16 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Example Template
Added Paths:
-----------
trunk/morphixlivekiosk/templates/MLK-example.xml
Added: trunk/morphixlivekiosk/templates/MLK-example.xml
===================================================================
--- trunk/morphixlivekiosk/templates/MLK-example.xml (rev 0)
+++ trunk/morphixlivekiosk/templates/MLK-example.xml 2007-10-23 22:45:16 UTC (rev 2575)
@@ -0,0 +1,32 @@
+<comps>
+ <group>
+ <kiosk>
+ <version>0.0.1</version>
+ <brand>MorphixLiveKiosk</brand>
+ <!-- Graphic could be a local file -->
+ <graphic>http://www.morphix.org/doc/how_tos/images/MorphixLiveKiosk.png</graphic>
+ <homepage>www.morphix.org</homepage>
+ <navbar>true</navbar>
+ <!-- Include the extra bits, some of which maybe non-free -->
+ <!-- Morphix calls them Minimodules, debian-live calls them hooks -->
+ <extralist>
+ <MiniModule>MorphixMini-NonFree-FlashPlugin.xml</MiniModule>
+ <MiniModule>MorphixMini-NonFree-Java.xml</MiniModule>
+ <!-- <hook>sun-java6.sh<hook> -->
+ </extralist>
+ <network>
+ <dhcp>true</dhcp>
+ <!-- To be implimented in next phase only here for reference
+ <static>
+ <ip>192.168.1.4<ip>
+ <mask>255.255.255.0</mask>
+ <default>192.168.1.1</default>
+ <nameserver>192.168.1.1</nameserver>
+ </static>
+ <wepkey>12345678901234567890123456789012</wepkey>
+ <wpakey>12345678901234567890123456789012</wpakey>
+ -->
+ </network>
+ </kiosk>
+ </group>
+</comps>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-23 22:43:47
|
Revision: 2574
http://morphix.svn.sourceforge.net/morphix/?rev=2574&view=rev
Author: bmsleight
Date: 2007-10-23 15:43:44 -0700 (Tue, 23 Oct 2007)
Log Message:
-----------
Ready for testing
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/kabt.sh
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-21 23:03:23 UTC (rev 2573)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-23 22:43:44 UTC (rev 2574)
@@ -110,15 +110,17 @@
else
echo "No NavBar"
ECOMMENT_OUT="-->"
- COMMENT_OUT="\!--"
+ COMMENT_OUT="<\!--"
fi
cp $CACHED/$MINIPRE $TMP_DIR/
-sed -e s/ECOMMENTOUTNAVBAR/$ECOMMENTOUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
+sed -e s/ECOMMENTOUTNAVBAR/$ECOMMENT_OUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
mv $TMP_FILE $TMP_DIR/$MINIPRE
sed -e s/COMMENTOUTNAVBAR/$COMMENT_OUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
mv $TMP_FILE $TMP_DIR/$MINIPRE
sed -e s/HOMEPAGE/$HOMEPAGE/g $TMP_DIR/$MINIPRE >$TMP_FILE
mv $TMP_FILE $TMP_DIR/$MINIPRE
+sed -e s/BRANDNAME/$BRAND/g $TMP_DIR/$MINIPRE >$TMP_FILE
+mv $TMP_FILE $TMP_DIR/$MINIPRE
if [ "$DHCP" = "true" ]; then
NETWORKCOMMANDS="<command>dhclient<\/command>"
else
@@ -126,6 +128,7 @@
fi
sed -e s/NETWORKCOMMANDS/$NETWORKCOMMANDS/g $TMP_DIR/$MINIPRE >$TMP_FILE
mv $TMP_FILE $TMP_DIR/$MINIPRE
+morphmini $TMP_DIR/$MINIPRE $TMP_DIR/KioskSetting.mod
}
put_kiosk_parts_together ()
@@ -143,6 +146,10 @@
echo "$MINI.mod is not stored in cache. Not added"
fi
done
+isomorph --add mini $TMP_DIR/KioskSetting.mod $TMP_DIR/output.iso $TMP_DIR/isomorph.iso
+mv $TMP_DIR/isomorph.iso $TMP_DIR/output.iso
+isomorph --add copy $TEMPLATE /morphix/ $TMP_DIR/output.iso $TMP_DIR/isomorph.iso
+mv $TMP_DIR/isomorph.iso $TMP_DIR/output.iso
}
rebrand ()
@@ -197,7 +204,10 @@
echo "Get head of queue"
wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/queue.txt $QUEUEURL
HEADTEMPLATE=$(head -n 1 $TMP_DIR/queue.txt)
-wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/template.xml $HEADTEMPLATE
+ISHTTP=${HEADTEMPLATE:0:7}
+if [ "$ISHTTP" = "http://" ]; then
+ wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/template.xml $HEADTEMPLATE
+fi
}
call_kabt ()
@@ -208,19 +218,25 @@
else
CALLTESTING=""
fi
-$0 $CALLTESTING -b $TMP_DIR/build-list.txt -t $TMP_DIR/template.xml -l $LOCALDIR
+if [ -e $TMP_DIR/template.xml ]; then
+ $0 $CALLTESTING -b $TMP_DIR/build-list.txt -t $TMP_DIR/template.xml -l $LOCALDIR
+else
+ echo "Queue empty"
+fi
}
call_webserver_with_links ()
{
-echo "Call Webserver with links"
-CALLWL="${EXTERNALURL}"
-CALLWLISO=$(cut -d\ -f1 $TMP_DIR/build-list.txt)
-CALLWLOGG=$(cut -d\ -f2 $TMP_DIR/build-list.txt)
-CALLWLISOBN=$(basename $CALLWLISO)
-CALLWLOGGBN=$(basename $CALLWLOGG)
-CALLWL="${EXTERNALURL}&b=${CALLWLISOBN}&v=${CALLWLOGGBN}"
-echo wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
+if [ -e $TMP_DIR/template.xml ]; then
+ echo "Call Webserver with links"
+ CALLWL="${EXTERNALURL}"
+ CALLWLISO=$(cut -d\ -f1 $TMP_DIR/build-list.txt)
+ CALLWLOGG=$(cut -d\ -f2 $TMP_DIR/build-list.txt)
+ CALLWLISOBN=$(basename $CALLWLISO)
+ CALLWLOGGBN=$(basename $CALLWLOGG)
+ CALLWL="${EXTERNALURL}&b=${CALLWLISOBN}&v=${CALLWLOGGBN}"
+ echo wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
+fi
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-21 23:03:29
|
Revision: 2573
http://morphix.svn.sourceforge.net/morphix/?rev=2573&view=rev
Author: bmsleight
Date: 2007-10-21 16:03:23 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Work in progress
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/kabt.sh
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-21 13:44:18 UTC (rev 2572)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-21 23:03:23 UTC (rev 2573)
@@ -97,7 +97,7 @@
DHCP="$RETURN_VALUE"
xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE
EXTRAMINIS=$(cat $TMP_FILE)
-OUTPUT="$LOCALDIR/$DATE_$BRAND"
+OUTPUT="$LOCALDIR/${DATE}_$BRAND"
}
build_kiosk_setting_mini ()
@@ -179,19 +179,70 @@
fi
}
+write_buildlist ()
+{
+if [ "$NOTESTING" = "true" ]; then
+ ECHOBUILDLIST="$OUTPUT.iso"
+else
+ ECHOBUILDLIST="$OUTPUT.iso $OUTPUT.ogg"
+fi
+if [ -n "$BUILDLIST" ]; then
+ echo "$ECHOBUILDLIST" >$BUILDLIST
+fi
+echo "$ECHOBUILDLIST"
+}
+get_head_of_queue ()
+{
+echo "Get head of queue"
+wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/queue.txt $QUEUEURL
+HEADTEMPLATE=$(head -n 1 $TMP_DIR/queue.txt)
+wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/template.xml $HEADTEMPLATE
+}
+
+call_kabt ()
+{
+echo "Kabt calling kabt (recursive)"
+if [ "$NOTESTING" = "true" ]; then
+ CALLTESTING="-n"
+else
+ CALLTESTING=""
+fi
+$0 $CALLTESTING -b $TMP_DIR/build-list.txt -t $TMP_DIR/template.xml -l $LOCALDIR
+}
+
+call_webserver_with_links ()
+{
+echo "Call Webserver with links"
+CALLWL="${EXTERNALURL}"
+CALLWLISO=$(cut -d\ -f1 $TMP_DIR/build-list.txt)
+CALLWLOGG=$(cut -d\ -f2 $TMP_DIR/build-list.txt)
+CALLWLISOBN=$(basename $CALLWLISO)
+CALLWLOGGBN=$(basename $CALLWLOGG)
+CALLWL="${EXTERNALURL}&b=${CALLWLISOBN}&v=${CALLWLOGGBN}"
+echo wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/call.txt $CALLWL
+}
+
+
build_kiosk ()
{
-echo
get_template_details
build_kiosk_setting_mini
put_kiosk_parts_together
rebrand
save_iso
autotest
+write_buildlist
}
-while getopts Snt:l:q:e: opt
+queue_build_kiosk ()
+{
+get_head_of_queue
+call_kabt
+call_webserver_with_links
+}
+
+while getopts Snt:l:q:e:b: opt
do
case "$opt" in
S) SETUP="true";;
@@ -200,10 +251,11 @@
q) QUEUEURL="$OPTARG";;
l) LOCALDIR="$OPTARG";;
e) EXTERNALURL="$OPTARG";;
+ b) BUILDLIST="$OPTARG";;
\?) # unknown flag
echo >&2 " kabt -S /output/directory/"
- echo >&2 " kabt [-n] -t template.xml -l /var/www/upload/"
+ echo >&2 " kabt [-n] [-b ./build-list.txt] -t template.xml -l /var/www/upload/"
echo >&2 " kabt [-n] -q http://example.com/queue/ -l /var/www/upload/ -e www.foobar.com%2Fupload%2F"
exit 1;;
esac
@@ -213,13 +265,14 @@
#Confirm parameters
if [ -z "$SETUP$TEMPLATE$QUEUEURL" ]; then
echo " kabt -S"
- echo " kabt [-n] -t template.xml -l /var/www/upload/"
+ echo " kabt [-n] [-b ./build-list.txt] -t template.xml -l /var/www/upload/"
echo " kabt [-n] -q http://example.com/queue/ -l /var/www/upload/ -e www.foobar.com%2Fupload%2F"
echo
echo " -S download all the parts and set-up kabt. "
echo " -n Do not test the built kiosk LiveCD"
echo " -t using the template build and test a Kiosk LiveCD"
echo " -l The local location of the built videos and iso"
+ echo " -b Write the built file names to this file"
echo " -q queue.txt Build the first template in the queue.txt"
echo " The http://example.com/queue/ contains a plain txt of urls pointing a list of templates.xml "
echo " -l The local location of the built videos and iso"
@@ -247,5 +300,7 @@
if [ -n "$TEMPLATE" ]; then
build_kiosk
fi
-
+if [ -n "$QUEUEURL" ]; then
+ queue_build_kiosk
+fi
clean_tmp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-21 13:44:25
|
Revision: 2572
http://morphix.svn.sourceforge.net/morphix/?rev=2572&view=rev
Author: bmsleight
Date: 2007-10-21 06:44:18 -0700 (Sun, 21 Oct 2007)
Log Message:
-----------
Work in progress
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/kabt.sh
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-20 13:59:53 UTC (rev 2571)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-21 13:44:18 UTC (rev 2572)
@@ -33,6 +33,8 @@
SETUPXMLURL="http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml"
SETUPXML="kiosk-builder-settings.xml"
MINIPRE="kioskmini.xml.pre"
+DATE=$(date +"%F--%H-%M")
+
}
clean_tmp ()
@@ -95,6 +97,7 @@
DHCP="$RETURN_VALUE"
xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE
EXTRAMINIS=$(cat $TMP_FILE)
+OUTPUT="$LOCALDIR/$DATE_$BRAND"
}
build_kiosk_setting_mini ()
@@ -128,11 +131,14 @@
put_kiosk_parts_together ()
{
echo "Putting Kiosk parts together."
+cp $CACHED/2nd-stage.iso $TMP_DIR/output.iso
for MINIS in $EXTRAMINIS
do
echo "Adding $MINI"
- if [ -e "$CACHED/minimodules/$MINIS.mod" ];
+ if [ -e "$CACHED/minimodules/$MINIS.mod" ]; then
echo "Adding $MINIS"
+ isomorph --add mini $CACHED/minimodules/$MINIS.mod $TMP_DIR/output.iso $TMP_DIR/isomorph.iso
+ mv $TMP_DIR/isomorph.iso $TMP_DIR/output.iso
else
echo "$MINI.mod is not stored in cache. Not added"
fi
@@ -142,11 +148,35 @@
rebrand ()
{
echo "Rebrand"
+#http:// part=${string:0:5}
+REMOTE=${GRAPHIC:0:7}
+if [ "$REMOTE" = "http://" ]; then
+ echo "Remote Grpahic"
+ wget --tries=3 --timeout=60 -nv --output-document=$TMP_DIR/$BRAND.png $GRAPHIC
+else
+ echo "Local Graphic"
+ cp $GRAPHIC $TMP_DIR/$BRAND.png
+fi
+morphix-rebrand $TMP_DIR/output.iso $TMP_DIR/rebrand.iso $TMP_DIR/$BRAND.png
+mv $TMP_DIR/rebrand.iso $TMP_DIR/output.iso
}
+save_iso ()
+{
+echo "Save"
+mv "$TMP_DIR/output.iso" "$OUTPUT.iso"
+#date
+}
+
autotest ()
{
echo "AutoTest"
+#mv "$TMP_DIR/output.iso" "$OUTPUT.iso"
+if [ "$NOTESTING" = "true" ]; then
+ echo "Not testing the built iso"
+else
+ echo video-qemu-booting-iso.sh -q qemu_0.8.4-etch1 -t 600 -g 1024x768 -s "spc,spc,kp_enter" $OUTPUT.iso $OUTPUT.ogg
+fi
}
@@ -157,6 +187,7 @@
build_kiosk_setting_mini
put_kiosk_parts_together
rebrand
+save_iso
autotest
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-20 13:59:58
|
Revision: 2571
http://morphix.svn.sourceforge.net/morphix/?rev=2571&view=rev
Author: bmsleight
Date: 2007-10-20 06:59:53 -0700 (Sat, 20 Oct 2007)
Log Message:
-----------
Work in progress
Modified Paths:
--------------
trunk/morphixlivekiosk/scripts/kabt.sh
Modified: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-18 21:42:36 UTC (rev 2570)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-20 13:59:53 UTC (rev 2571)
@@ -25,13 +25,14 @@
get_global_variables ()
{
-TMP_DIR=/tmp/kabt.$$
+TMP_DIR=/tmp/kabt.$$.dir
TMP_FILE=/tmp/kabt.$$.tmp
-TMP_FILE_2=/tmp/kabt.$$.2.tmp
+TMP_FILE_2=/tmp/kabt.$$.tmp.2
mkdir $TMP_DIR
CACHED=~/.kabt/
SETUPXMLURL="http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml"
SETUPXML="kiosk-builder-settings.xml"
+MINIPRE="kioskmini.xml.pre"
}
clean_tmp ()
@@ -61,10 +62,10 @@
mkdir -p $CACHED/minimodules/
wget --tries=3 --timeout=60 -nv --directory-prefix=$CACHED $SETUPXMLURL
xml_get "//kioskbuilder/morphix" "base" "base" $CACHED/$SETUPXML
-wget --tries=3 --timeout=60 -nv --output-document=$CACHED/base $RETURN_VALUE
+wget --tries=3 --timeout=60 -nv --output-document=$CACHED/base.iso $RETURN_VALUE
xml_get "//kioskbuilder/morphix" "mainmodule" "mainmodule" $CACHED/$SETUPXML
wget --tries=3 --timeout=60 -nv --output-document=$CACHED/mainmodule.mod $RETURN_VALUE
-xml_get "//kioskbuilder/morphix" "kioskminipre" "kioskminipre" $CACHED/$SETUPXML
+xml_get "//kioskbuilder/morphix" "kioskminipre" "kioskminipre" $CACHED/kioskmini.xml.pre
wget --tries=3 --timeout=60 -nv --output-document=$CACHED/mainmodule.mod $RETURN_VALUE
xml_get_tmp "//kioskbuilder/morphix" "minilist" "MiniModule" $CACHED/$SETUPXML
RETURN_VALUE=$(cat $TMP_FILE)
@@ -76,9 +77,89 @@
do
morphmini $MINIS $MINIS.mod
done
+isomorph --add main $CACHED/mainmodule.mod $CACHED/base.iso $CACHED/2nd-stage.iso
}
+get_template_details ()
+{
+echo "Get Template Details"
+xml_get "//kiosk" "brand" "brand" $TEMPLATE
+BRAND="$RETURN_VALUE"
+xml_get "//kiosk" "graphic" "graphic" $TEMPLATE
+GRAPHIC="$RETURN_VALUE"
+xml_get "//kiosk" "homepage" "homepage" $TEMPLATE
+HOMEPAGE="$RETURN_VALUE"
+xml_get "//kiosk" "navbar" "navbar" $TEMPLATE
+NAVBAR="$RETURN_VALUE"
+xml_get_tmp "//kiosk/network" "dhcp" "dhcp" $TEMPLATE
+DHCP="$RETURN_VALUE"
+xml_get_tmp "//kiosk" "extralist" "MiniModule" $TEMPLATE
+EXTRAMINIS=$(cat $TMP_FILE)
+}
+build_kiosk_setting_mini ()
+{
+echo "Build Kiosk Setting (MiniModule)"
+if [ "$NAVBAR" = "true" ]; then
+ echo "$NAVBAR"
+ ECOMMENT_OUT=""
+ COMMENT_OUT=""
+else
+ echo "No NavBar"
+ ECOMMENT_OUT="-->"
+ COMMENT_OUT="\!--"
+fi
+cp $CACHED/$MINIPRE $TMP_DIR/
+sed -e s/ECOMMENTOUTNAVBAR/$ECOMMENTOUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
+mv $TMP_FILE $TMP_DIR/$MINIPRE
+sed -e s/COMMENTOUTNAVBAR/$COMMENT_OUT/g $TMP_DIR/$MINIPRE >$TMP_FILE
+mv $TMP_FILE $TMP_DIR/$MINIPRE
+sed -e s/HOMEPAGE/$HOMEPAGE/g $TMP_DIR/$MINIPRE >$TMP_FILE
+mv $TMP_FILE $TMP_DIR/$MINIPRE
+if [ "$DHCP" = "true" ]; then
+ NETWORKCOMMANDS="<command>dhclient<\/command>"
+else
+ NETWORKCOMMANDS="<\!--BlankNetworkSettings-->"
+fi
+sed -e s/NETWORKCOMMANDS/$NETWORKCOMMANDS/g $TMP_DIR/$MINIPRE >$TMP_FILE
+mv $TMP_FILE $TMP_DIR/$MINIPRE
+}
+
+put_kiosk_parts_together ()
+{
+echo "Putting Kiosk parts together."
+for MINIS in $EXTRAMINIS
+do
+ echo "Adding $MINI"
+ if [ -e "$CACHED/minimodules/$MINIS.mod" ];
+ echo "Adding $MINIS"
+ else
+ echo "$MINI.mod is not stored in cache. Not added"
+ fi
+done
+}
+
+rebrand ()
+{
+echo "Rebrand"
+}
+
+autotest ()
+{
+echo "AutoTest"
+}
+
+
+build_kiosk ()
+{
+echo
+get_template_details
+build_kiosk_setting_mini
+put_kiosk_parts_together
+rebrand
+autotest
+}
+
while getopts Snt:l:q:e: opt
do
case "$opt" in
@@ -129,7 +210,11 @@
am_i_root_exit_if_not
get_global_variables
-clean_tmp
if [ -n "$SETUP" ]; then
set_up
fi
+if [ -n "$TEMPLATE" ]; then
+ build_kiosk
+fi
+
+clean_tmp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-18 21:42:41
|
Revision: 2570
http://morphix.svn.sourceforge.net/morphix/?rev=2570&view=rev
Author: bmsleight
Date: 2007-10-18 14:42:36 -0700 (Thu, 18 Oct 2007)
Log Message:
-----------
KABT Kiosk Automatic Build Test
Modified Paths:
--------------
trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml
Added Paths:
-----------
trunk/morphixlivekiosk/scripts/
trunk/morphixlivekiosk/scripts/kabt.sh
Added: trunk/morphixlivekiosk/scripts/kabt.sh
===================================================================
--- trunk/morphixlivekiosk/scripts/kabt.sh (rev 0)
+++ trunk/morphixlivekiosk/scripts/kabt.sh 2007-10-18 21:42:36 UTC (rev 2570)
@@ -0,0 +1,135 @@
+#!/bin/bash
+#
+# KABT Kiosk Automatic Build Test
+#
+#
+# Copyleft (c) 2007 Brendan M. Sleight #
+# <bmsleight@barwap._REMOVE_SPAM_TRAP.com> #
+# #
+# This script is licensed under the GNU GPL v2 or later. #
+# #
+# On Debian systems, this license can be obtained via #
+# /usr/share/common-licenses/GPL #
+# #
+# Expect this script o be run as a cron job #
+# #
+
+
+am_i_root_exit_if_not ()
+{
+if [ `id -u` -ne 0 ]; then
+ echo "Need to have be able to run the mount command, i.e. must be root"
+ exit
+fi
+}
+
+get_global_variables ()
+{
+TMP_DIR=/tmp/kabt.$$
+TMP_FILE=/tmp/kabt.$$.tmp
+TMP_FILE_2=/tmp/kabt.$$.2.tmp
+mkdir $TMP_DIR
+CACHED=~/.kabt/
+SETUPXMLURL="http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml"
+SETUPXML="kiosk-builder-settings.xml"
+}
+
+clean_tmp ()
+{
+rm $TMP_DIR -r 2>/dev/null
+rm $TMP_FILE 2>/dev/null
+rm $TMP_FILE_2 2>/dev/null
+}
+
+xml_get ()
+{
+ RETURN_VALUE=$(xmlstarlet sel -t -m "$1" -v "$2" -v "@$3" -n $4 | sed 's/^[ \t]*//' | sed /^$/d)
+}
+
+xml_get_tmp ()
+{
+ xmlstarlet sel -t -m "$1" -v "$2" -v "@$3" -n $4 | sed 's/^[ \t]*//' | sed /^$/d >$TMP_FILE
+}
+
+
+set_up ()
+{
+if [ -d "$CACHED" ]; then
+ echo "$CACHED exists. Need to remove files"
+ rm $CACHED -R
+fi
+mkdir -p $CACHED/minimodules/
+wget --tries=3 --timeout=60 -nv --directory-prefix=$CACHED $SETUPXMLURL
+xml_get "//kioskbuilder/morphix" "base" "base" $CACHED/$SETUPXML
+wget --tries=3 --timeout=60 -nv --output-document=$CACHED/base $RETURN_VALUE
+xml_get "//kioskbuilder/morphix" "mainmodule" "mainmodule" $CACHED/$SETUPXML
+wget --tries=3 --timeout=60 -nv --output-document=$CACHED/mainmodule.mod $RETURN_VALUE
+xml_get "//kioskbuilder/morphix" "kioskminipre" "kioskminipre" $CACHED/$SETUPXML
+wget --tries=3 --timeout=60 -nv --output-document=$CACHED/mainmodule.mod $RETURN_VALUE
+xml_get_tmp "//kioskbuilder/morphix" "minilist" "MiniModule" $CACHED/$SETUPXML
+RETURN_VALUE=$(cat $TMP_FILE)
+for MINIS in $RETURN_VALUE
+do
+ wget --tries=3 --timeout=60 -nv --directory-prefix=$CACHED/minimodules/ $MINIS
+done
+for MINIS in $CACHED/minimodules/*.xml
+do
+ morphmini $MINIS $MINIS.mod
+done
+}
+
+
+while getopts Snt:l:q:e: opt
+do
+ case "$opt" in
+ S) SETUP="true";;
+ n) NOTESTING="true";;
+ t) TEMPLATE="$OPTARG";;
+ q) QUEUEURL="$OPTARG";;
+ l) LOCALDIR="$OPTARG";;
+ e) EXTERNALURL="$OPTARG";;
+
+ \?) # unknown flag
+ echo >&2 " kabt -S /output/directory/"
+ echo >&2 " kabt [-n] -t template.xml -l /var/www/upload/"
+ echo >&2 " kabt [-n] -q http://example.com/queue/ -l /var/www/upload/ -e www.foobar.com%2Fupload%2F"
+ exit 1;;
+ esac
+done
+shift `expr $OPTIND - 1`
+
+#Confirm parameters
+if [ -z "$SETUP$TEMPLATE$QUEUEURL" ]; then
+ echo " kabt -S"
+ echo " kabt [-n] -t template.xml -l /var/www/upload/"
+ echo " kabt [-n] -q http://example.com/queue/ -l /var/www/upload/ -e www.foobar.com%2Fupload%2F"
+ echo
+ echo " -S download all the parts and set-up kabt. "
+ echo " -n Do not test the built kiosk LiveCD"
+ echo " -t using the template build and test a Kiosk LiveCD"
+ echo " -l The local location of the built videos and iso"
+ echo " -q queue.txt Build the first template in the queue.txt"
+ echo " The http://example.com/queue/ contains a plain txt of urls pointing a list of templates.xml "
+ echo " -l The local location of the built videos and iso"
+ echo " -e The external url of the local location"
+ echo " Once build kabt will call "
+ echo " http://example.com/queue/?built=www.foobar.com%2Fupload%2F&v=b123-testing.ogg&i=b123-testing.iso"
+ echo " This should remove the top line of the queue from http://example.com/queue/"
+ echo
+fi
+if [ -n "$TEMPLATE" -a -z "$LOCALDIR" ]; then
+ echo " kabt [-n] -t template.xml -l /var/www/upload/"
+fi
+
+if [ -n "$QUEUEURL" ]; then
+ if [ -z "$LOCALDIR" -o -z "$EXTERNALURL" ]; then
+ echo " kabt [-n] -q http://example.com/queue/ -l /var/www/upload/ -e www.foobar.com%2Fupload%2F"
+ fi
+fi
+
+am_i_root_exit_if_not
+get_global_variables
+clean_tmp
+if [ -n "$SETUP" ]; then
+ set_up
+fi
Property changes on: trunk/morphixlivekiosk/scripts/kabt.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml
===================================================================
--- trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml 2007-10-17 19:55:14 UTC (rev 2569)
+++ trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml 2007-10-18 21:42:36 UTC (rev 2570)
@@ -4,6 +4,7 @@
<morphix>
<base>http://surfnet.dl.sourceforge.net/sourceforge/morphix/MorphixBase-0.5-pre6.iso</base>
<mainmodule>http://www.barwap.com/morphix/livekiosk/MorphixLiveKiosk.mod</mainmodule>
+ <kioskminipre>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-KioskSetting.xml.pre</kioskminipre>
<minilist>
<MiniModule>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml</MiniModule>
<MiniModule>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-NonFree-Java.xml</MiniModule>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-17 19:55:26
|
Revision: 2569
http://morphix.svn.sourceforge.net/morphix/?rev=2569&view=rev
Author: bmsleight
Date: 2007-10-17 12:55:14 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
New project - new typos
Modified Paths:
--------------
trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml
Modified: trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml
===================================================================
--- trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml 2007-10-17 19:53:36 UTC (rev 2568)
+++ trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml 2007-10-17 19:55:14 UTC (rev 2569)
@@ -2,7 +2,7 @@
<group>
<kioskbuilder>
<morphix>
- <base>"http://surfnet.dl.sourceforge.net/sourceforge/morphix/MorphixBase-0.5-pre6.iso</base>
+ <base>http://surfnet.dl.sourceforge.net/sourceforge/morphix/MorphixBase-0.5-pre6.iso</base>
<mainmodule>http://www.barwap.com/morphix/livekiosk/MorphixLiveKiosk.mod</mainmodule>
<minilist>
<MiniModule>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml</MiniModule>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bms...@us...> - 2007-10-17 19:53:47
|
Revision: 2568
http://morphix.svn.sourceforge.net/morphix/?rev=2568&view=rev
Author: bmsleight
Date: 2007-10-17 12:53:36 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
New project
Added Paths:
-----------
trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml
Added: trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml
===================================================================
--- trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml (rev 0)
+++ trunk/morphixlivekiosk/templates/kiosk-builder-settings.xml 2007-10-17 19:53:36 UTC (rev 2568)
@@ -0,0 +1,19 @@
+<comps>
+ <group>
+ <kioskbuilder>
+ <morphix>
+ <base>"http://surfnet.dl.sourceforge.net/sourceforge/morphix/MorphixBase-0.5-pre6.iso</base>
+ <mainmodule>http://www.barwap.com/morphix/livekiosk/MorphixLiveKiosk.mod</mainmodule>
+ <minilist>
+ <MiniModule>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-NonFree-FlashPlugin.xml</MiniModule>
+ <MiniModule>http://morphix.svn.sourceforge.net/viewvc/*checkout*/morphix/trunk/scripts-mini/MorphixMini-NonFree-Java.xml</MiniModule>
+ <!-- Further Minis to cover wireless cards etc to be added... -->
+ </minilist>
+ </morphix>
+ <!-- To be implimented in next phase only here for reference
+ <debianlive>
+ </debianlive>
+ -->
+ </kioskbuilder>
+ </group>
+</comps>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pa...@us...> - 2007-10-17 17:15:27
|
Revision: 2567
http://morphix.svn.sourceforge.net/morphix/?rev=2567&view=rev
Author: paul_c
Date: 2007-10-17 10:05:06 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
*cough* Time for a new build ?
Modified Paths:
--------------
trunk/mmaker/debian/changelog
Modified: trunk/mmaker/debian/changelog
===================================================================
--- trunk/mmaker/debian/changelog 2007-10-17 16:56:35 UTC (rev 2566)
+++ trunk/mmaker/debian/changelog 2007-10-17 17:05:06 UTC (rev 2567)
@@ -1,3 +1,9 @@
+morphix-mmaker (0.4-43) unstable; urgency=low
+
+ * Bug fix from Michael Bunk to correctly parse localdeb option.
+
+ -- paul_c <pa...@us...> Wed, 17 Oct 2007 18:03:20 +0100
+
morphix-mmaker (0.4-42) unstable; urgency=low
* Bumping for etch-version
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
