summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b095a72)
raw | patch | inline | side by side (parent: b095a72)
author | Thomas Potthast <tpotthast@ti.com> | |
Mon, 20 Jun 2011 19:56:12 +0000 (14:56 -0500) | ||
committer | Thomas Potthast <tpotthast@ti.com> | |
Mon, 20 Jun 2011 19:56:12 +0000 (14:56 -0500) |
97 files changed:
diff --git a/bin/2DAcceleration/2d-icon.png b/bin/2DAcceleration/2d-icon.png
deleted file mode 100644 (file)
index 4b15d50..0000000
Binary files a/bin/2DAcceleration/2d-icon.png and /dev/null differ
index 4b15d50..0000000
Binary files a/bin/2DAcceleration/2d-icon.png and /dev/null differ
diff --git a/bin/2DAcceleration/MANIFEST.json b/bin/2DAcceleration/MANIFEST.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "Application" : {
- "title" : "2D Acceleration",
- "iconName" : "2DAcceleration/2d-icon.png",
- "appName" : "/usr/local/bin/2D_accel/runbxdemo",
- "appText" : "Disable",
- "appDesc" : "/usr/share/matrix/html/desc_2d.html",
- "submenu" : "Qt4"
- }
-}
diff --git a/bin/3D/3d-icon.png b/bin/3D/3d-icon.png
deleted file mode 100644 (file)
index 8180662..0000000
Binary files a/bin/3D/3d-icon.png and /dev/null differ
index 8180662..0000000
Binary files a/bin/3D/3d-icon.png and /dev/null differ
diff --git a/bin/3D/MANIFEST.json b/bin/3D/MANIFEST.json
--- a/bin/3D/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "3D",
- "iconName" : "3D/3d-icon.png",
- "appName" : "Submenu",
- "contents" : "3D/"
- }
-}
diff --git a/bin/Chameleon/3d1-icon.png b/bin/Chameleon/3d1-icon.png
deleted file mode 100644 (file)
index 3229334..0000000
Binary files a/bin/Chameleon/3d1-icon.png and /dev/null differ
index 3229334..0000000
Binary files a/bin/Chameleon/3d1-icon.png and /dev/null differ
diff --git a/bin/Chameleon/MANIFEST.json b/bin/Chameleon/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Chameleon",
- "iconName" : "Chameleon/3d1-icon.png",
- "appName" : "runOGLESChameleonMan",
- "appParameters" : "-qaf=1000",
- "submenu" : "3D"
- }
-}
diff --git a/bin/Coverflow/3d3-icon.png b/bin/Coverflow/3d3-icon.png
deleted file mode 100644 (file)
index e2073ed..0000000
Binary files a/bin/Coverflow/3d3-icon.png and /dev/null differ
index e2073ed..0000000
Binary files a/bin/Coverflow/3d3-icon.png and /dev/null differ
diff --git a/bin/Coverflow/MANIFEST.json b/bin/Coverflow/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Coverflow",
- "iconName" : "Coverflow/3d3-icon.png",
- "appName" : "runOGLES2Coverflow",
- "appParameters" : "-qaf=1000",
- "submenu" : "3D"
- }
-}
diff --git a/bin/Shaders/3d4-icon.png b/bin/Shaders/3d4-icon.png
deleted file mode 100644 (file)
index d7ac780..0000000
Binary files a/bin/Shaders/3d4-icon.png and /dev/null differ
index d7ac780..0000000
Binary files a/bin/Shaders/3d4-icon.png and /dev/null differ
diff --git a/bin/Shaders/MANIFEST.json b/bin/Shaders/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Shaders",
- "iconName" : "Shaders/3d4-icon.png",
- "appName" : "runOGLES2Shaders",
- "appParameters" : "-qaf=1000",
- "submenu" : "3D"
- }
-}
diff --git a/bin/Vase/3d2-icon.png b/bin/Vase/3d2-icon.png
deleted file mode 100644 (file)
index 3a40d1f..0000000
Binary files a/bin/Vase/3d2-icon.png and /dev/null differ
index 3a40d1f..0000000
Binary files a/bin/Vase/3d2-icon.png and /dev/null differ
diff --git a/bin/Vase/MANIFEST.json b/bin/Vase/MANIFEST.json
--- a/bin/Vase/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Vase",
- "iconName" : "Vase/3d2-icon.png",
- "appName" : "runOGLESVase",
- "appParameters" : "-qaf=1000",
- "submenu" : "3D"
- }
-}
diff --git a/bin/animatedtiles/MANIFEST.json b/bin/animatedtiles/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Animated Tiles",
- "iconName" : "animatedtiles/qt-icon.png",
- "appName" : "/usr/bin/qtopia/examples/animation/animatedtiles/animatedtiles",
- "appText" : "Disable",
- "submenu" : "Qt4"
- }
-}
diff --git a/bin/animatedtiles/qt-icon.png b/bin/animatedtiles/qt-icon.png
deleted file mode 100644 (file)
index 8034ae0..0000000
Binary files a/bin/animatedtiles/qt-icon.png and /dev/null differ
index 8034ae0..0000000
Binary files a/bin/animatedtiles/qt-icon.png and /dev/null differ
diff --git a/bin/arm/MANIFEST.json b/bin/arm/MANIFEST.json
--- a/bin/arm/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-"Application" : {
- "title" : "ARM",
- "iconName" : "arm/arm-icon.png",
- "appName" : "Submenu",
- "contents" : "arm/"
- }
-}
diff --git a/bin/arm/arm-icon.png b/bin/arm/arm-icon.png
deleted file mode 100644 (file)
index 9e49154..0000000
Binary files a/bin/arm/arm-icon.png and /dev/null differ
index 9e49154..0000000
Binary files a/bin/arm/arm-icon.png and /dev/null differ
diff --git a/bin/browser/MANIFEST.json b/bin/browser/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Browser",
- "iconName" : "browser/web-icon.png",
- "appName" : "/usr/share/matrix/bin/browser/browser",
- "appParameters" : "http://ti.com",
- "appText" : "Disable"
- }
-}
diff --git a/bin/browser/browser b/bin/browser/browser
--- a/bin/browser/browser
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/bin/qtopia/demos/browser/browser $*
diff --git a/bin/browser/web-icon.png b/bin/browser/web-icon.png
deleted file mode 100644 (file)
index c3e3c8c..0000000
Binary files a/bin/browser/web-icon.png and /dev/null differ
index c3e3c8c..0000000
Binary files a/bin/browser/web-icon.png and /dev/null differ
diff --git a/bin/calculator/2d-icon.png b/bin/calculator/2d-icon.png
deleted file mode 100644 (file)
index 4b15d50..0000000
Binary files a/bin/calculator/2d-icon.png and /dev/null differ
index 4b15d50..0000000
Binary files a/bin/calculator/2d-icon.png and /dev/null differ
diff --git a/bin/calculator/MANIFEST.json b/bin/calculator/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Calculator",
- "iconName" : "calculator/2d-icon.png",
- "appName" : "/usr/bin/qtopia/examples/widgets/calculator/calculator",
- "submenu" : "settings"
- }
-}
diff --git a/bin/camera/MANIFEST.json b/bin/camera/MANIFEST.json
--- a/bin/camera/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "camera/multimedia-icon.png",
- "appName" : "Submenu",
- "title" : "Camera",
- "contents" : "comingsoon"
- }
-}
diff --git a/bin/camera/multimedia-icon.png b/bin/camera/multimedia-icon.png
deleted file mode 100644 (file)
index be2b56c..0000000
Binary files a/bin/camera/multimedia-icon.png and /dev/null differ
index be2b56c..0000000
Binary files a/bin/camera/multimedia-icon.png and /dev/null differ
diff --git a/bin/coming_soon/MANIFEST.json b/bin/coming_soon/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Coming Soon",
- "iconName" : "coming_soon/coming-icon.png",
- "appName" : "",
- "submenu" : "comingsoon"
- }
-}
diff --git a/bin/coming_soon/coming-icon.png b/bin/coming_soon/coming-icon.png
deleted file mode 100644 (file)
index 6f34e68..0000000
Binary files a/bin/coming_soon/coming-icon.png and /dev/null differ
index 6f34e68..0000000
Binary files a/bin/coming_soon/coming-icon.png and /dev/null differ
diff --git a/bin/cryptos/MANIFEST.json b/bin/cryptos/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "cryptos/encrypt-icon.png",
- "appName" : "Submenu",
- "title" : "Cryptos",
- "contents" : "cryptos/"
- }
-}
diff --git a/bin/cryptos/encrypt-icon.png b/bin/cryptos/encrypt-icon.png
deleted file mode 100644 (file)
index 3da791a..0000000
Binary files a/bin/cryptos/encrypt-icon.png and /dev/null differ
index 3da791a..0000000
Binary files a/bin/cryptos/encrypt-icon.png and /dev/null differ
diff --git a/bin/dhrystone/MANIFEST.json b/bin/dhrystone/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Dhrystone",
- "iconName" : "dhrystone/arm-icon.png",
- "appDesc" : "/usr/share/matrix/html/desc_dhrystone.html",
- "appName" : "path_to_exec",
- "submenu" : "arm/"
- }
-}
diff --git a/bin/dhrystone/arm-icon.png b/bin/dhrystone/arm-icon.png
deleted file mode 100644 (file)
index 9e49154..0000000
Binary files a/bin/dhrystone/arm-icon.png and /dev/null differ
index 9e49154..0000000
Binary files a/bin/dhrystone/arm-icon.png and /dev/null differ
diff --git a/bin/elasticnodes/MANIFEST.json b/bin/elasticnodes/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Elastic Nodes",
- "iconName" : "elasticnodes/qt-icon.png",
- "appName" : "/usr/bin/qtopia/examples/graphicsview/elasticnodes/elasticnodes",
- "appText" : "Disable",
- "submenu" : "Qt4"
- }
-}
diff --git a/bin/elasticnodes/qt-icon.png b/bin/elasticnodes/qt-icon.png
deleted file mode 100644 (file)
index 8034ae0..0000000
Binary files a/bin/elasticnodes/qt-icon.png and /dev/null differ
index 8034ae0..0000000
Binary files a/bin/elasticnodes/qt-icon.png and /dev/null differ
diff --git a/bin/ethernet/MANIFEST.json b/bin/ethernet/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "ethernet/network-icon.png",
- "appName" : "Submenu",
- "title" : "Ethernet",
- "contents" : "comingsoon"
- }
-}
diff --git a/bin/ethernet/network-icon.png b/bin/ethernet/network-icon.png
deleted file mode 100644 (file)
index fbb431b..0000000
Binary files a/bin/ethernet/network-icon.png and /dev/null differ
index fbb431b..0000000
Binary files a/bin/ethernet/network-icon.png and /dev/null differ
diff --git a/bin/linpack/MANIFEST.json b/bin/linpack/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Linpack",
- "iconName" : "linpack/arm-icon.png",
- "appDesc" : "",
- "appName" : "path_to_exec",
- "submenu" : "arm"
- }
-}
diff --git a/bin/linpack/arm-icon.png b/bin/linpack/arm-icon.png
deleted file mode 100644 (file)
index 9e49154..0000000
Binary files a/bin/linpack/arm-icon.png and /dev/null differ
index 9e49154..0000000
Binary files a/bin/linpack/arm-icon.png and /dev/null differ
diff --git a/bin/ls/MANIFEST.json b/bin/ls/MANIFEST.json
--- a/bin/ls/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "LS Demo",
- "iconName" : "ls/tux-icon.png",
- "appDesc" : "",
- "appName" : "ls",
- "appParameters" : "-lR"
- }
-}
diff --git a/bin/ls/tux-icon.png b/bin/ls/tux-icon.png
deleted file mode 100644 (file)
index f385a57..0000000
Binary files a/bin/ls/tux-icon.png and /dev/null differ
index f385a57..0000000
Binary files a/bin/ls/tux-icon.png and /dev/null differ
diff --git a/bin/meminfo/MANIFEST.json b/bin/meminfo/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Memory",
- "iconName" : "meminfo/memsettings-icon.png",
- "appName" : "bin/meminfo/memInfo",
- "submenu" : "settings"
- }
-}
diff --git a/bin/meminfo/memInfo b/bin/meminfo/memInfo
--- a/bin/meminfo/memInfo
+++ /dev/null
@@ -1,42 +0,0 @@
-# Module: memInfo
-#
-# Description: This script is used to list the memory partition information
-#
-# Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
-#
-# Redistribution and use in source and binary forms, with or withou
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of Texas Instruments Incorporated nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-echo "-------------------------------------------------------------"
-echo "Memory Information"
-echo "-------------------------------------------------------------"
-echo ""
-free
-echo ""
-df -h
diff --git a/bin/meminfo/memsettings-icon.png b/bin/meminfo/memsettings-icon.png
deleted file mode 100644 (file)
index 78400f5..0000000
Binary files a/bin/meminfo/memsettings-icon.png and /dev/null differ
index 78400f5..0000000
Binary files a/bin/meminfo/memsettings-icon.png and /dev/null differ
diff --git a/bin/moveblocks/MANIFEST.json b/bin/moveblocks/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "Moving Blocks",
- "iconName" : "moveblocks/qt-icon.png",
- "appName" : "/usr/bin/qtopia/examples/animation/moveblocks/moveblocks",
- "appText" : "Disable",
- "submenu" : "Qt4"
- }
-}
diff --git a/bin/moveblocks/qt-icon.png b/bin/moveblocks/qt-icon.png
deleted file mode 100644 (file)
index 8034ae0..0000000
Binary files a/bin/moveblocks/qt-icon.png and /dev/null differ
index 8034ae0..0000000
Binary files a/bin/moveblocks/qt-icon.png and /dev/null differ
diff --git a/bin/multimedia/MANIFEST.json b/bin/multimedia/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "multimedia/multimedia-icon.png",
- "appName" : "Submenu",
- "title" : "Multimedia",
- "contents" : "comingsoon/"
- }
-}
diff --git a/bin/multimedia/multimedia-icon.png b/bin/multimedia/multimedia-icon.png
deleted file mode 100644 (file)
index be2b56c..0000000
Binary files a/bin/multimedia/multimedia-icon.png and /dev/null differ
index be2b56c..0000000
Binary files a/bin/multimedia/multimedia-icon.png and /dev/null differ
diff --git a/bin/networksettings/MANIFEST.json b/bin/networksettings/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Network",
- "iconName" : "networksettings/netsettings-icon.png",
- "appName" : "bin/networksettings/networkSettings",
- "submenu" : "settings"
- }
-}
diff --git a/bin/networksettings/netsettings-icon.png b/bin/networksettings/netsettings-icon.png
deleted file mode 100644 (file)
index b48b62a..0000000
Binary files a/bin/networksettings/netsettings-icon.png and /dev/null differ
index b48b62a..0000000
Binary files a/bin/networksettings/netsettings-icon.png and /dev/null differ
diff --git a/bin/networksettings/networkSettings b/bin/networksettings/networkSettings
+++ /dev/null
@@ -1,40 +0,0 @@
-# Module: networkSettings
-#
-# Description: This script is used to list the network settings details
-#
-# Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
-#
-# Redistribution and use in source and binary forms, with or withou
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of Texas Instruments Incorporated nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-echo "-------------------------------------------------------------"
-echo "Network Settings"
-echo "-------------------------------------------------------------"
-echo ""
-ifconfig -a
diff --git a/bin/openssl_aes256_encdec/openssl_aes256_encdec.sh b/bin/openssl_aes256_encdec/openssl_aes256_encdec.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-DATAFILE=rnddata
-OUTFILE=OpenSSLEncDecResults.txt
-ERRFILE=timeResults.txt
-
-
-OPENSSL=openssl
-
-CRYPTOTYPE=aes-256-cbc
-
-echo -e "\nRunning OpenSSL Encryption Decryption (${CRYPTOTYPE})"
-
-if [ ! -r rnddata ]
-then
- echo "Creating 10M random data file ($DATAFILE)"
- dd if=/dev/urandom of=rnddata bs=1048576 count=10
-fi
-
-
-
-## Check OpenSSL version
-$OPENSSL version
-
-
-
-
-## Encrypt without HW acceleration
-time -v $OPENSSL enc -${CRYPTOTYPE} -salt -in $DATAFILE -out $DATAFILE.swenc -pass pass:crypto 2> $ERRFILE
-echo "Encrypting 10M file with no HW acceleration"
-egrep 'User|System|Percent|Elapsed' $ERRFILE
-
-## Decrypt without HW acceleration
-time -v $OPENSSL enc -d -${CRYPTOTYPE} -in $DATAFILE.swenc -pass pass:crypto > $DATAFILE.swdec 2> $ERRFILE
-echo "Decrypting 10M file with no HW acceleration"
-egrep 'User|System|Percent|Elapsed' $ERRFILE
-
-echo -e "\n$DATAFILE=original file; $DATAFILE.swenc=encrypted file; $DATAFILE.swdec=decrypted file"
-ls -l $DATAFILE $DATAFILE.swenc $DATAFILE.swdec
-
-echo "Decrypted file is now being compared to the original"
-echo "Please wait..."
-
-diff $DATAFILE $DATAFILE.swdec
-if [ `echo $?` = "0" ]
-then
- echo "### diff of $DATAFILE and $DATAFILE.swdec indicates that they are the same"
-else
- echo "### diff of $DATAFILE and $DATAFILE.swdec indicates that they are the different!! This should not ever happen!!"
-fi
-
-
diff --git a/bin/openssl_display_cert/openssl_display_cert.sh b/bin/openssl_display_cert/openssl_display_cert.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-CERTFILE=matrixcert.pem
-
-
-OPENSSL=openssl
-
-echo -e "\nDisplay Certificate Information"
-
-
-
-
-
-if [ ! -r $CERTFILE ]
-then
- echo "Certificate does not exist."
-else
- $OPENSSL x509 -text -in $CERTFILE | more
-fi
-
-
diff --git a/bin/openssl_gen_cert/openssl_gen_cert.sh b/bin/openssl_gen_cert/openssl_gen_cert.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-CERTFILE=matrixcert.pem
-CERTSUBJ='/C=US/ST=Texas/L=Dallas/O=Texas Instruments/OU=ARM MPU/CN=Sitara User/emailAddress=SitaraUser@ti.com'
-
-
-OPENSSL=openssl
-
-echo -e "\nGenerating Self Signed Certificate"
-
-
-
-
-
-if [ ! -r $CERTFILE ]
-then
- echo "Creating certificate (${CERTFILE})"
- $OPENSSL req -x509 -nodes -days 365 -subj '/C=US/ST=Texas/L=Dallas/O=Texas Instruments/OU=ARM MPU/CN=Sitara User/emailAddress=SitaraUser@ti.com' -newkey rsa:1024 -keyout $CERTFILE -out $CERTFILE
-else
- echo -e "\n## Certificate already exists."
- echo -e "## Delete ${CERTFILE} first and then run this script again to create a fresh certificate.\n"
- echo -e "## Or run the Certificate Info routine to view the existing certificate.\n"
- exit
-fi
-
-cat $CERTFILE
-
diff --git a/bin/openssl_gen_pubkey/openssl_gen_pubkey.sh b/bin/openssl_gen_pubkey/openssl_gen_pubkey.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-CERTFILE=matrixcert.pem
-PUBKEY=pubkey.pem
-
-
-OPENSSL=openssl
-
-echo -e "\nGenerating Public Key from ${CERTFILE}"
-
-
-if [ ! -r $CERTFILE ]
-then
- echo "Certificate does not exist. Generate certificate first before generating a public key"
- exit
-else
- $OPENSSL rsa -in $CERTFILE -pubout > $PUBKEY
- echo -e "\nPublic Key written to ${PUBKEY}\n"
-fi
-
-cat $PUBKEY
-
diff --git a/bin/openssl_gen_sha1/openssl_gen_sha1hash.sh b/bin/openssl_gen_sha1/openssl_gen_sha1hash.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-DATAFILE=rnddata
-
-
-OPENSSL=openssl
-
-echo -e "\nGenerate SHA1 Hash"
-
-if [ ! -r $DATAFILE ]
-then
- echo "Creating 10M random data file ($DATAFILE)"
- echo "Please Wait..."
- dd if=/dev/urandom of=rnddata bs=1048576 count=10
-fi
-
-
-$OPENSSL dgst -sha1 $DATAFILE > $DATAFILE.sha1
-echo -e "\n## Digest of file $DATAFILE is in $DATAFILE.sha1"
-cat $DATAFILE.sha1
-
-
diff --git a/bin/openssl_perf/openssl_perf.sh b/bin/openssl_perf/openssl_perf.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-OUTFILE=OpenSSLspeedResults.txt
-
-
-OPENSSL=openssl
-
-
-$OPENSSL version
-
-echo "Running OpenSSL Speed test. "
-echo "This test can take several minutes. Please Wait..."
-
-
-time -v $OPENSSL speed -evp aes-128-cbc >> $OUTFILE 2> $OUTFILE
-time -v $OPENSSL speed -evp aes-192-cbc >> $OUTFILE 2>> $OUTFILE
-time -v $OPENSSL speed -evp aes-256-cbc >> $OUTFILE 2>> $OUTFILE
-time -v $OPENSSL speed -evp des-cbc >> $OUTFILE 2>> $OUTFILE
-time -v $OPENSSL speed -evp des3 >> $OUTFILE 2>> $OUTFILE
-time -v $OPENSSL speed -evp sha1 >> $OUTFILE 2>> $OUTFILE
-time -v $OPENSSL speed -evp md5 >> $OUTFILE 2>> $OUTFILE
-
-egrep 'Doing|User|System|Percent|Elapsed' $OUTFILE
-echo "Summary above. Complete results written to ${OUTFILE}"
-
-
diff --git a/bin/power/MANIFEST.json b/bin/power/MANIFEST.json
--- a/bin/power/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "power/power-icon.png",
- "appName" : "Submenu",
- "title" : "Power",
- "contents" : "power"
- }
-}
diff --git a/bin/power/power-icon.png b/bin/power/power-icon.png
deleted file mode 100644 (file)
index 7778c0f..0000000
Binary files a/bin/power/power-icon.png and /dev/null differ
index 7778c0f..0000000
Binary files a/bin/power/power-icon.png and /dev/null differ
diff --git a/bin/power_1000/MANIFEST.json b/bin/power_1000/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Set 1 Ghz",
- "iconName" : "power_1000/power-icon.png",
- "appName" : "setopp1",
- "submenu" : "power"
- }
-}
diff --git a/bin/power_1000/power-icon.png b/bin/power_1000/power-icon.png
deleted file mode 100644 (file)
index 7778c0f..0000000
Binary files a/bin/power_1000/power-icon.png and /dev/null differ
index 7778c0f..0000000
Binary files a/bin/power_1000/power-icon.png and /dev/null differ
diff --git a/bin/power_300/MANIFEST.json b/bin/power_300/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Set 300Mhz",
- "iconName" : "power_300/power-icon.png",
- "appName" : "setopp2",
- "submenu" : "power"
- }
-}
diff --git a/bin/power_300/power-icon.png b/bin/power_300/power-icon.png
deleted file mode 100644 (file)
index 7778c0f..0000000
Binary files a/bin/power_300/power-icon.png and /dev/null differ
index 7778c0f..0000000
Binary files a/bin/power_300/power-icon.png and /dev/null differ
diff --git a/bin/power_600/MANIFEST.json b/bin/power_600/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Set 600Mhz",
- "iconName" : "power_600/power-icon.png",
- "appName" : "setopp3",
- "submenu" : "power"
- }
-}
diff --git a/bin/power_600/power-icon.png b/bin/power_600/power-icon.png
deleted file mode 100644 (file)
index 7778c0f..0000000
Binary files a/bin/power_600/power-icon.png and /dev/null differ
index 7778c0f..0000000
Binary files a/bin/power_600/power-icon.png and /dev/null differ
diff --git a/bin/power_800/MANIFEST.json b/bin/power_800/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Set 800Mhz",
- "iconName" : "power_800/power-icon.png",
- "appName" : "setopp4",
- "submenu" : "power"
- }
-}
diff --git a/bin/power_800/power-icon.png b/bin/power_800/power-icon.png
deleted file mode 100644 (file)
index 7778c0f..0000000
Binary files a/bin/power_800/power-icon.png and /dev/null differ
index 7778c0f..0000000
Binary files a/bin/power_800/power-icon.png and /dev/null differ
diff --git a/bin/qt4/MANIFEST.json b/bin/qt4/MANIFEST.json
--- a/bin/qt4/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Qt4",
- "iconName" : "qt4/qt-icon.png",
- "appName" : "Submenu",
- "contents" : "Qt4/"
- }
-}
diff --git a/bin/qt4/qt-icon.png b/bin/qt4/qt-icon.png
deleted file mode 100644 (file)
index 8034ae0..0000000
Binary files a/bin/qt4/qt-icon.png and /dev/null differ
index 8034ae0..0000000
Binary files a/bin/qt4/qt-icon.png and /dev/null differ
diff --git a/bin/settings/MANIFEST.json b/bin/settings/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "settings/settings-icon.png",
- "appName" : "Submenu",
- "title" : "Settings",
- "contents" : "settings/"
- }
-}
diff --git a/bin/settings/settings-icon.png b/bin/settings/settings-icon.png
deleted file mode 100644 (file)
index 903b93b..0000000
Binary files a/bin/settings/settings-icon.png and /dev/null differ
index 903b93b..0000000
Binary files a/bin/settings/settings-icon.png and /dev/null differ
diff --git a/bin/shutdown/MANIFEST.json b/bin/shutdown/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "System Shutdown",
- "iconName" : "shutdown/power-icon.png",
- "appName" : "bin/shutdown/runSystemShutdown",
- "submenu" : "settings"
- }
-}
diff --git a/bin/shutdown/power-icon.png b/bin/shutdown/power-icon.png
deleted file mode 100644 (file)
index 7778c0f..0000000
Binary files a/bin/shutdown/power-icon.png and /dev/null differ
index 7778c0f..0000000
Binary files a/bin/shutdown/power-icon.png and /dev/null differ
diff --git a/bin/shutdown/runSystemShutdown b/bin/shutdown/runSystemShutdown
+++ /dev/null
@@ -1,4 +0,0 @@
-echo " "
-echo " "
-echo "Entire system shutting down now"
-shutdown -h now
diff --git a/bin/sysinfo/MANIFEST.json b/bin/sysinfo/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "System Info",
- "iconName" : "sysinfo/info-icon.png",
- "appName" : "bin/sysinfo/sysSettings",
- "submenu" : "settings"
- }
-}
diff --git a/bin/sysinfo/info-icon.png b/bin/sysinfo/info-icon.png
deleted file mode 100644 (file)
index 680a189..0000000
Binary files a/bin/sysinfo/info-icon.png and /dev/null differ
index 680a189..0000000
Binary files a/bin/sysinfo/info-icon.png and /dev/null differ
diff --git a/bin/sysinfo/sysSettings b/bin/sysinfo/sysSettings
--- a/bin/sysinfo/sysSettings
+++ /dev/null
@@ -1,60 +0,0 @@
-# Module: sysSettings
-#
-# Description: This script is used to list the system settings of the EVM
-#
-# Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
-#
-# Redistribution and use in source and binary forms, with or withou
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of Texas Instruments Incorporated nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-echo "-------------------------------------------------------------"
-echo "About This EVM"
-echo "-------------------------------------------------------------"
-echo ""
-cat /proc/cpuinfo
-cat /proc/version | awk '{gsub("version","version\t:");print}' | awk '{gsub(" \\(","\n");print}' | awk '{gsub("gcc","GCC");print}' | awk '{gsub(" \\) ","\n");print}' | awk '{gsub("\\)","");print}'
-#sgxVer=`(./bin/mem_util 0x48004B48 w 0x2 | ./bin/mem_util 0x48004B10 w 0x1 | ./bin/mem_util 0x48004B00 w 0x2 | ./bin/mem_util 0x50000014 w)`
-sgxVer=`(mem_util 0x48004B48 w 0x2 )`
-sgxVer=`(mem_util 0x48004B10 w 0x1)`
-sgxVer=`(mem_util 0x48004B00 w 0x2)`
-sgxVer=`(mem_util 0x50000014 w)`
-
-ver5=10205
-ver3=10201
-ver2=10003
-
-if [ "$sgxVer" = "$ver5" ]; then
- echo "SGX Core Version: 5.x"
-elif [ "$sgxVer" = "$ver3" ]; then
- echo "SGX Core Version: 3.x"
-elif [ "$sgxVer" = "$ver2" ]; then
- echo "SGX Core Version: 2.x"
-else
- echo "SGX Core Version: Unknown"
-fi
diff --git a/bin/taskinfo/MANIFEST.json b/bin/taskinfo/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Task Info",
- "iconName" : "taskinfo/info-icon.png",
- "appName" : "bin/taskinfo/taskInfo",
- "submenu" : "settings"
- }
-}
diff --git a/bin/taskinfo/info-icon.png b/bin/taskinfo/info-icon.png
deleted file mode 100644 (file)
index 680a189..0000000
Binary files a/bin/taskinfo/info-icon.png and /dev/null differ
index 680a189..0000000
Binary files a/bin/taskinfo/info-icon.png and /dev/null differ
diff --git a/bin/taskinfo/taskInfo b/bin/taskinfo/taskInfo
--- a/bin/taskinfo/taskInfo
+++ /dev/null
@@ -1,39 +0,0 @@
-# Module: taskInfo
-#
-# Description: This script is used to display task information
-#
-# Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
-#
-# Redistribution and use in source and binary forms, with or withou
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-#
-# Neither the name of Texas Instruments Incorporated nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-echo "-------------------------------------------------------------"
-echo "EVM Task Information"
-echo "-------------------------------------------------------------"
-ps
diff --git a/bin/toggledesc/MANIFEST.json b/bin/toggledesc/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Desc on / off",
- "iconName" : "toggledesc/settings-icon.png",
- "appName" : "bin/toggledesc/toggledesc.sh",
- "submenu" : "settings"
- }
-}
diff --git a/bin/toggledesc/settings-icon.png b/bin/toggledesc/settings-icon.png
deleted file mode 100644 (file)
index 903b93b..0000000
Binary files a/bin/toggledesc/settings-icon.png and /dev/null differ
index 903b93b..0000000
Binary files a/bin/toggledesc/settings-icon.png and /dev/null differ
diff --git a/bin/toggledesc/toggledesc.sh b/bin/toggledesc/toggledesc.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "not currently implemented"
diff --git a/bin/usb/MANIFEST.json b/bin/usb/MANIFEST.json
--- a/bin/usb/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "usb/usb-icon.png",
- "appName" : "Submenu",
- "title" : "USB",
- "contents" : "comingsoon"
- }
-}
diff --git a/bin/usb/usb-icon.png b/bin/usb/usb-icon.png
deleted file mode 100644 (file)
index 09b0980..0000000
Binary files a/bin/usb/usb-icon.png and /dev/null differ
index 09b0980..0000000
Binary files a/bin/usb/usb-icon.png and /dev/null differ
diff --git a/bin/wifi/MANIFEST.json b/bin/wifi/MANIFEST.json
--- a/bin/wifi/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "iconName" : "wifi/wireless-icon.png",
- "appName" : "Submenu",
- "title" : "Wi-Fi",
- "contents" : "wifi/"
- }
-}
diff --git a/bin/wifi/wireless-icon.png b/bin/wifi/wireless-icon.png
deleted file mode 100644 (file)
index 5e08bdb..0000000
Binary files a/bin/wifi/wireless-icon.png and /dev/null differ
index 5e08bdb..0000000
Binary files a/bin/wifi/wireless-icon.png and /dev/null differ
diff --git a/bin/wpa/MANIFEST.json b/bin/wpa/MANIFEST.json
--- a/bin/wpa/MANIFEST.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "Application" : {
- "title" : "WPA",
- "iconName" : "wpa/wireless-icon.png",
- "appName" : "bin/wpa/wpatest.sh",
- "appParameters" : "wpa_gui-e -geometry 480x240+0+0",
- "submenu" : "wifi"
- }
-}
diff --git a/bin/wpa/wireless-icon.png b/bin/wpa/wireless-icon.png
deleted file mode 100644 (file)
index 5e08bdb..0000000
Binary files a/bin/wpa/wireless-icon.png and /dev/null differ
index 5e08bdb..0000000
Binary files a/bin/wpa/wireless-icon.png and /dev/null differ
diff --git a/bin/wpa/wpatest.sh b/bin/wpa/wpatest.sh
--- a/bin/wpa/wpatest.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -e /var/volatile/run/tiwlan0 ]; then
- $1 -p /var/volatile/run -i tiwlan0
-else
- echo "wpa_supplicant not running"
-fi
diff --git a/bin/xgxperf/MANIFEST.json b/bin/xgxperf/MANIFEST.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "Application" : {
- "title" : "Xgx Perf",
- "iconName" : "xgxperf/xgxperf-icon.png",
- "appName" : "",
- "appDescription" : "bin/xgxperf/description.html"
- }
-}
diff --git a/bin/xgxperf/description.html b/bin/xgxperf/description.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<h1> XgxPerf - Overview </h1>
-
-<h2> Xgxperf attempts to make it easier to create,evaluate, and benchmark
-Graphics Applications - for developers using TI Graphics Technologies. </h2>
-<p></p>
-<p>It enables creating Graphical Interfaces of varying complexities, and
-measure the performance impact of the UI elements and functionalities, by
-creating and running the UI on an actual Target Hardware.</p>
-<p></p>
-<p>Xgxperf provides readymade applications developers and customers to start
-using, and extending - Text and transparent windows, Medical ECG Monitors,
-Automotive Tacho meter displays, Browsers, Automation HMI, Surveillance HMI,
-Sewing Machine HM.</p>
-<p></p>
-<h2>XgxPerf is included in the SDK, but is not integrated in to the matrix application launcher yet. If
-you would like try XgxPerf or get more information, please see:
-http://processors.wiki.ti.com/index.php/Xgxperf </h2>
diff --git a/bin/xgxperf/xgxperf-icon.png b/bin/xgxperf/xgxperf-icon.png
deleted file mode 100644 (file)
index d3e4b79..0000000
Binary files a/bin/xgxperf/xgxperf-icon.png and /dev/null differ
index d3e4b79..0000000
Binary files a/bin/xgxperf/xgxperf-icon.png and /dev/null differ
diff --git a/config/matrix.json b/config/matrix.json
--- a/config/matrix.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "appsListPrefix" : "/menu/",
- "appDescriptionName" : "MANIFEST.json",
- "appsFolder" : "bin/"
-}
diff --git a/css/matrix.css b/css/matrix.css
index 4d72638fb3fe67e5170c46cc5c1d5625fdd62318..b31481fcaab91af3f58bdf69ac5ae17c17e1fb4b 100644 (file)
--- a/css/matrix.css
+++ b/css/matrix.css
}
.runDiv{
width:100%;
+ text-align: center;
+ padding-top: 10px;
}
.outputDiv{
clear: both;
+ padding-top: 10px;
}
.outputDiv h1{
font-size: 20px;
diff --git a/index.html b/index.html
index e5b9a2748cfa48c9b93af7a8b85da699d0135574..3757bf2c946c80a17adaf5df9e63db26cbdbf314 100644 (file)
--- a/index.html
+++ b/index.html
<script type="text/javascript" language="javascript">
window.onload = function(){
$(document.body).clickNScroll();
+ $("#txlogo").click(function(e){
+ $.ajax("/clearcache/",
+ {
+ success: function(data, textStatus, jqXHR){
+ window.location.reload();
+ }
+ });
+ });
};
</script>
</head>
diff --git a/lib/applist.js b/lib/applist.js
index 18a46279955391cf73372ba4a1e706effc17d136..d4110911ff524d574afab57a8ab9d3581cf8c10d 100644 (file)
--- a/lib/applist.js
+++ b/lib/applist.js
sys = require("sys"),
path = require("path"),
pageBuilder = require("./pageBuilder.js"),
- configs = require("./configs.js");
+ configs = require("./configs.js"),
+ mUtils = require("./matrixutils.js");
exports.getAppListPrefix = function(){
return configs.appListPrefix;
exports.getConfigFilename = function(){
return configs.appDescriptionName;
}
-exports.cleanStr = function(str){
- var beginIdx = str.indexOf("/");
- var endIdx = str.lastIndexOf("/");
- beginIdx = Math.max(beginIdx, 0);
- endIdx = (endIdx == -1) ? str.length : endIdx;
- str = str.substring(beginIdx, endIdx - beginIdx);
- return str;
-}
-exports.isInSubmenu = function(actual, requested){
- //drop trailing slashes on both
- actual = exports.cleanStr(actual);
- requested = exports.cleanStr(requested);
-
- //both to lower case; used for case insensetive comparison
- actual = actual.toLowerCase();
- requested = requested.toLowerCase();
- return actual == requested;
-}
-exports.isAppListRequest = function(uri){
- var prefix = exports.getAppListPrefix();
- var check = uri.substring(0, prefix.length);
- if( check === prefix){
- console.log("app list request found");
- return true;
- }
- return false;
+exports.isInSubmenu = function(actual, requested){
+ return mUtils.pathCompare(actual, requested);
}
exports.checkCompletion = function(statuses, list, response, submenu){
for(var i in statuses){
return;
}
}
-/*
- response.writeHead(200, {"Content-Type": "text/plain"});
- response.write(JSON.stringify(list));
- response.end();
-*/
console.log("building menu");
+ console.log(JSON.stringify(list));
pageBuilder.createMenuPage(list, response, submenu);
}
-exports.processManifest = function(fPath, list, idx, statuses, response, submenu){
- var configFile = path.join(fPath, exports.getConfigFilename());
- var processed;
- path.exists(configFile, function(exists){
- if(!exists){
- statuses[idx] = 1;
- exports.checkCompletion(statuses, list, response);
- return;
+exports.processItem = function(filePath, list, statuses, response, submenu){
+ fs.stat(filePath, function(err, stats){
+ if(err){
+ statuses[filePath] = 1;
+ exports.checkCompletion(statuses, list, response, submenu);
+ return;
}
- fs.readFile(configFile, function(err, data){
- if(err){
- statuses[idx] = 1;
- exports.checkCompletion(statuses, list, response);
- return;
- }
- try{ //otherwise one bad manifest will take down the server
- processed = JSON.parse(data);
- processed.Application.manifestPath = configFile;
- if(processed.Application.hasOwnProperty("submenu")){
- if(exports.isInSubmenu(processed.Application.submenu, submenu)){
- list.push(processed);
- }
- }else if(submenu == ""){
- list.push(processed);
+ if(stats.isDirectory()){
+ fs.readdir(filePath, function(err, files){
+ if(err){
+ statuses[filePath] = 1;
+ exports.checkCompletion(statuses, list, response, submenu);
+ return;
}
- }catch(e){
- console.log("Invalid manifest at: " + configFile);
- console.log("File Data: \n" + data);
- }
- statuses[idx] = 1;
- exports.checkCompletion(statuses, list, response, submenu);
- });
+ var indices = [];
+ for(var i in files){
+ var idx = path.join(filePath, files[i]);
+ statuses[idx] = 0;
+ indices.push(idx);
+ }
+ for(var i in indices){
+ exports.processItem(indices[i], list, statuses, response, submenu);
+ }
+ });
+ } else if (stats.isFile()){
+ if(mUtils.isManifest(filePath)){
+ fs.readFile(filePath, function(err, data){
+ if(err){
+ statuses[filePath] = 1;
+ exports.checkCompletion(statuses, list, response, submenu);
+ return;
+ }
+ var parsed = mUtils.parseManifestData(data, filePath);
+ console.log(parsed);
+ console.log(submenu);
+ if(submenu == "" && (!parsed.Application.hasOwnProperty("categories") || parsed.Application.categories == "")){
+ list.push(parsed);
+}else if(parsed.Application.hasOwnProperty("categories") && mUtils.appInSubmenu(parsed.Application.categories, submenu)){
+ list.push(parsed);
+ }
+ });
+ }
+ }
+ statuses[filePath] = 1;
+ exports.checkCompletion(statuses, list, response, submenu);
});
}
exports.generateAppList = function(uri, response){
var appList = [];
var statuses = [];
var i = 0;
- //console.log(files);
for(var a in files){
- statuses[a] = 0;
+ statuses[path.join(filePath, files[a])] = 0;
}
for(var idx in files){
- var item = exports.processManifest(path.join(filePath, files[idx]), appList,idx, statuses, response, subdir);
+ exports.processItem(path.join(filePath, files[idx]), appList, statuses, response, subdir);
}
});
});
diff --git a/lib/configs.js b/lib/configs.js
index 43763f8b8490ece360a212afd701a9af926c1bba..e4f77f8f799062ff576aaba7f911651c835fe533 100644 (file)
--- a/lib/configs.js
+++ b/lib/configs.js
exports.appListPrefix = "/menu/";
-exports.appDescriptionName = "MANIFEST.json";
-exports.appsFolder = "bin/";
-exports.menuCacheDir = "menucache/";
+exports.appDescriptionPrefix = "/app/";
+exports.appLaunchPrefix = "/launch/";
+exports.iconPrefix = "/icons/";
+exports.cacheClearPrefix = "/clearcache/";
+exports.iconExtensions = [".png", ".gif", ".svg", ".jpg"];
+exports.appDescriptionName = ".desktop";
+exports.appsFolder = "apps/";
+exports.matrixImagesFolder = "/images/";
+exports.cacheDir = "cache/";
+exports.htmlBasePageUrl = "index.html";
+exports.jqueryUrl = "./jquery/jquery-1.6.1.min.js";
index 5179adec1f4c33fae83c6a0c9c1abf4f55209125..af865d6b8944ac26689c602c6b1a984da89e3c85 100644 (file)
--- a/lib/load_static_file.js
+++ b/lib/load_static_file.js
url = require("url"),
path = require("path"),
fs = require("fs"),
- events = require("events");
-
-exports.load_static_file = function (uri, response) {
- var filename = path.join(process.cwd(), uri);
- path.exists(filename, function(exists) {
- if(!exists) {
- response.writeHead(404, {"Content-Type": "text/plain"});
- response.write("404 Not Found\n");
- response.end();
- return;
- }
-
- fs.readFile(filename, "binary", function(err, file) {
- if(err) {
- response.writeHead(500, {"Content-Type": "text/plain"});
- response.write(err + "\n");
- response.end();
- return;
- }
+ events = require("events"),
+ configs = require("./configs.js");
+exports.loadFileFromRoot = function(filename, response){
+ path.exists(filename, function(exists) {
+ if(!exists) {
+ response.writeHead(404, {"Content-Type": "text/plain"});
+ response.write("404 Not Found\n");
+ response.end();
+ return;
+ }
+ fs.readFile(filename, "binary", function(err, file) {
+ if(err) {
+ response.writeHead(500, {"Content-Type": "text/plain"});
+ response.write(err + "\n");
+ response.end();
+ return;
+ }
- response.writeHead(200);
- response.write(file, "binary");
- response.end();
- });
+ response.writeHead(200);
+ response.write(file, "binary");
+ response.end();
+ });
});
+}
+exports.load_static_file = function (uri, response) {
+ var filename = path.join(process.cwd(), uri);
+ exports.loadFileFromRoot(filename, response);
+}
+exports.loadIcon = function(uri, response){
+ var filePath = uri.substring(configs.iconPrefix.length -1);
+ var relativePath = path.join(process.cwd(), filePath);
+ path.exists(relativePath, function(exists){
+ if(!exists){
+ exports.loadFileFromRoot(filePath, response);
+ }else{
+ exports.loadFileFromRoot(relativePath, response);
+ }
+ });
}
diff --git a/lib/pageBuilder.js b/lib/pageBuilder.js
index ee12eea4b16cb271bb7fc596a50c8dbf0a92e97f..73f22a8821f6a44b3654463a5b1cf1ed9f7e5638 100644 (file)
--- a/lib/pageBuilder.js
+++ b/lib/pageBuilder.js
var fs = require("fs");
var path = require("path");
var configs = require("./configs.js");
-var jqueryUrl = "./jquery/jquery-1.6.1.min.js";
-var htmlBasePageUrl = "index.html";
+mUtils = require("./matrixutils.js");
var addHeader = function( $, window, parentElem, showHome){
var header = window.document.createElement("div");
var tex = window.document.createElement("img");
var title = window.document.createElement("div");
- tex.src = "/images/header/tex.png";
+ tex.src = configs.matrixImagesFolder+"header/tex.png";
$(tex).addClass("tex");
-
+ $(tex).attr("id", "txlogo" );
$(title).append("Matrix Application Launcher");
$(title).addClass("title");
var homeLink = window.document.createElement("a");
homeLink.href = configs.appListPrefix;
var home = window.document.createElement("img");
- home.src = "/images/multi-icon.png";
+ home.src = configs.matrixImagesFolder+"multi-icon.png";
$(home).addClass("mainMenuBtn");
$(homeLink).append(home);
$(header).append(homeLink);
url = configs.appListPrefix + app.contents;
}else{
var appId = new Buffer(app.manifestPath).toString("base64");
- console.log(appId);
- url = "/app/" +appId ;
+ url = configs.appDescriptionPrefix + appId ;
}
var link = window.document.createElement("a");
link.href = url;
var img = window.document.createElement("img");
- $(img).attr("src", "/bin/" +app.iconName);
+ $(img).attr("src", path.join(configs.iconPrefix, app.iconName));
$(img).addClass("app_icon");
$(link).append(img);
var title = window.document.createElement("p");
return htmlStartTag() + $('html').html() + '</html>';
}
-var getCachePageName = function(submenu){
- return configs.menuCacheDir + "menu_"+submenu.replace("/", "_") + ".html";
+exports.getMenuCachePageName = function(submenu){
+ return configs.cacheDir + "menu_"+submenu.replace("/", "_") + ".html";
+}
+exports.getAppCachePageName = function(appId){
+ return configs.cacheDir + "app_"+appId + ".html";
}
exports.hasCachedMenu = function(submenu){
- return path.existsSync(getCachePageName(submenu));
+ return path.existsSync(exports.getMenuCachePageName(submenu));
}
-exports.loadCachedMenu = function(submenu, response){
- var file = getCachePageName(submenu);
+exports.hasCachedAppPage = function(appId){
+ return path.existsSync(exports.getAppCachePageName(appId));
+}
+exports.loadCachedFile = function(file, response){
fs.readFile(file, function(err, data){
if(err){
response.writeHead(500);
response.end();
});
}
+exports.loadCachedMenu = function(submenu, response){
+ exports.loadCachedFile(exports.getMenuCachePageName(submenu), response);
+}
+exports.loadCachedAppPage = function(appId, response){
+ exports.loadCachedFile(exports.getAppCachePageName(appId), response);
+}
exports.createMenuPage = function(apps, response, submenu){
- fs.readFile(htmlBasePageUrl, function(error, data){
+ fs.readFile(configs.htmlBasePageUrl, function(error, data){
if(error){
return "Error";
}
jsdom.env({
html: data.toString("ascii"),
- scripts: [ jqueryUrl ]
+ scripts: [ configs.jqueryUrl ]
}, function(err, window){
if(error){
return "Error";
$(matrixDisplay).append(appContainer);
$(window.document.body).append(matrixDisplay);
var responseHtml = getHtml($);
- fs.writeFile(getCachePageName(submenu), responseHtml, function(err){
+ fs.writeFile(exports.getMenuCachePageName(submenu), responseHtml, function(err){
if(err){
console.log("Could not write cache file");
}
});
});
}
-exports.createAppPage = function(appId, response){
+var cacheApp = function(appId, html){
+ fs.writeFile(exports.getAppCachePageName(appId), html, function(err){
+ if(err){
+ console.log("Could not write cache file for app ID:" +appId);
+ return;
+ }
+ console.log("cache file created for app ID: " + appId);
+ });
+}
+exports.createAppPage = function(uri, response){
+ var appId = mUtils.getAppIdFromUri(uri);
+ if(exports.hasCachedAppPage(appId)){
+ console.log("using cached App Page");
+ exports.loadCachedAppPage(appId, response);
+ return;
+ }
var manifestPath = new Buffer(appId, "base64").toString("ascii");
- console.log(manifestPath);
+ path.exists(manifestPath, function(exists){
+ if(!exists){
+ response.writeHead(404);
+ response.write("Page Not found");
+ response.end();
+ return;
+ }
+ fs.readFile(manifestPath, function(err, data){
+ if(err){
+ response.writeHead(500);
+ response.write("Error reading file");
+ response.end();
+ return;
+ }
+ var processed = mUtils.parseManifestData(data.toString("ascii"));
+ var app = processed.Application;
+ fs.readFile(configs.htmlBasePageUrl, function(error, data){
+ if(error){
+ response.writeHead(500);
+ response.write("Error");
+ response.end();
+ return;
+ }
+ jsdom.env({
+ html: data.toString("ascii"),
+ scripts: [ configs.jqueryUrl ]
+ }, function(err, window){
+ if(error){
+ response.writeHead(500);
+ response.write("Error");
+ response.end();
+ return
+ }
+ var $ = window.jQuery;
+ var matrixDisplay = window.document.createElement("div");
+ addHeader( $, window, matrixDisplay, true);
+ var appDesc = window.document.createElement("div");
+ $(appDesc).addClass("outputDiv");
+ $(matrixDisplay).append(appDesc);
+ if(app.hasOwnProperty("appName") && app.appName != ""){
+ var runDiv = window.document.createElement("div");
+ var link = window.document.createElement("a");
+ link.href = configs.appLaunchPrefix + appId;
+ var runImg = window.document.createElement("img");
+ runImg.src = configs.matrixImagesFolder+"run-icon.png";
+ $(runDiv).addClass("runDiv");
+ $(link).append(runImg);
+ $(runDiv).append(link);
+ $(matrixDisplay).append(runDiv);
+ }
+ $(window.document.body).append(matrixDisplay);
+ if(app.hasOwnProperty("appDescription")){
+ var appPage = app.appDescription;
+ path.exists(appPage, function(exists){
+ if(!exists){
+ $(appDesc).append("App Description Page Not Found");
+ var html = getHtml($);
+ cacheApp(appId, html);
+ response.writeHead(200);
+ response.write(html);
+ response.end();
+ }
+ fs.readFile(appPage, function(err, data){
+ var desc = "";
+ if(err){
+ desc = "Error Reading App Description Page";
+ }else{
+ desc = data.toString("ascii");
+ }
+ $(appDesc).append(desc);
+ var html = getHtml($);
+ cacheApp(appId, html);
+ response.writeHead(200);
+ response.write(html);
+ response.end();
+ return;
+ });
+ });
+ }else{
+ $(appDesc).append("No App Description Provided");
+ var html = getHtml($);
+ cacheApp(appId, html);
+ response.writeHead(200);
+ response.write(html);
+ response.end();
+ return;
+ }
+ });
+ });
+ });
+ });
}
diff --git a/server.js b/server.js
index 2c46c4c11c25e75574f6e8dc14dd5c92739614b3..948be0efab642e748b935becbcc534f0f0dde5a3 100644 (file)
--- a/server.js
+++ b/server.js
loader = require("./lib/load_static_file"),
applist = require("./lib/applist"),
appLauncher = require("./lib/apps"),
- io = require("./lib/socket.io/lib/socket.io/");
+ io = require("./lib/socket.io/lib/socket.io/"),
+ mUtils = require("./lib/matrixutils.js"),
+ pageBuilder = require("./lib/pageBuilder.js");
var server = http.createServer(function(request, response) {
- var uri = url.parse(request.url).pathname;
- if(applist.isAppListRequest(uri)) {
- applist.generateAppList(uri, response);
- }else {
+ var uri = url.parse(request.url).pathname;
+// console.log("new request for uri: " + uri);
+ if(mUtils.isAppListRequest(uri)) {
+ applist.generateAppList(uri, response);
+ }else if(mUtils.isAppDescriptionRequest(uri)){
+ pageBuilder.createAppPage(uri, response);
+ }else if(mUtils.isAppIconRequest(uri)){
+ loader.loadIcon(uri, response);
+ }else if(mUtils.isCacheClearRequest(uri)){
+ mUtils.clearCache(response);
+ }else{
loader.load_static_file(uri, response);
}
});