v4.3: gnome and xo for gtk3 installersv4.3

7 files changed, 159 insertions, 1 deletions

diff --git a/CeibalEncuesta/gtk3/CeibalEncuesta.activity/activity/activity.info b/CeibalEncuesta/gtk3/CeibalEncuesta.activity/activity/activity.info
index 4d50543..32b0777 100644
--- a/CeibalEncuesta/gtk3/CeibalEncuesta.activity/activity/activity.info
+++ b/CeibalEncuesta/gtk3/CeibalEncuesta.activity/activity/activity.info
@@ -3,5 +3,5 @@ name = CeibalEncuesta
 license = GPLv2+
 icon = ceibal
 exec = sugar-activity CeibalEncuesta.CeibalEncuesta
-activity_version = 4.2
+activity_version = 4.3
 bundle_id = org.laptop.CeibalEncuesta
\ No newline at end of file
diff --git a/CeibalEncuesta/gtk3/installers/CeibalEncuesta-4.2.tar.gz b/CeibalEncuesta/gtk3/installers/CeibalEncuesta-4.2.tar.gz
deleted file mode 100644
index 110d0b3..0000000
--- a/CeibalEncuesta/gtk3/installers/CeibalEncuesta-4.2.tar.gz
+++ /dev/null
diff --git a/CeibalEncuesta/gtk3/installers/CeibalEncuesta.activity-gtk3.xo b/CeibalEncuesta/gtk3/installers/CeibalEncuesta.activity-gtk3.xo
index ace6607..e0d8142 100644
--- a/CeibalEncuesta/gtk3/installers/CeibalEncuesta.activity-gtk3.xo
+++ b/CeibalEncuesta/gtk3/installers/CeibalEncuesta.activity-gtk3.xo
diff --git a/CeibalEncuesta/gtk3/installers/CeibalEncuesta_Gtk3_4.3_Installer.zip b/CeibalEncuesta/gtk3/installers/CeibalEncuesta_Gtk3_4.3_Installer.zip
new file mode 100644
index 0000000..c304613
--- /dev/null
+++ b/CeibalEncuesta/gtk3/installers/CeibalEncuesta_Gtk3_4.3_Installer.zip
diff --git a/CeibalEncuesta/gtk3/scripts/prepare_gtk_installer.sh b/CeibalEncuesta/gtk3/scripts/prepare_gtk_installer.sh
new file mode 100755
index 0000000..1a05ed0
--- /dev/null
+++ b/CeibalEncuesta/gtk3/scripts/prepare_gtk_installer.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+CEIBAL_ENCUESTA_PATH='../CeibalEncuesta'
+version=$1
+
+if [ -z "$version" ]
+then
+    echo "You need enter version as first param, ex: ./prepare_xo_installer 4.2"
+    exit 1
+fi
+
+echo '#!/bin/sh
+
+tar xzf CeibalEncuesta-'"$version"'.tar.gz
+cd CeibalEncuesta-'"$version"' && python setup.py install
+cd ../ && rm -rf `ls| grep -i CeibalEncuesta | grep -v -w *.zip| grep -v -w *.desktop`
+' > installer.run
+while [ ! -f CeibalEncuesta-"$version".tar.gz ]
+do
+    echo "tar.gz file for version "$version" is not present"
+    echo "you need make with 'python setup.py sdist' and place here."
+    echo "remember modify version in setup.py file with new "$version
+    echo "do that and press [ENTER]: "
+    read key
+done
+
+mv installer.run CeibalEncuesta_Gtk3_"$version"_Installer.run
+chmod a+x CeibalEncuesta_Gtk3_"$version"_Installer.run
+zip installer.zip CeibalEncuesta_Gtk3_"$version"_Installer.run CeibalEncuesta-"$version".tar.gz
+
+if [ "$?" -ne "0" ]
+then
+    echo "Fail: doing gnome installer"
+    rm -rf CeibalEncuesta_Gtk3_"$version"_Installer.run
+    rm -rf installer.zip
+    exit 1
+else
+    mv installer.zip ../installers/CeibalEncuesta_Gtk3_"$version"_Installer.zip
+    echo ""
+    ls -l ../installers/CeibalEncuesta_Gtk3_"$version"_Installer.zip
+    rm -rf installer.zip
+    rm -rf CeibalEncuesta_Gtk3_"$version"_Installer.run
+    echo ""
+    echo "DONE: Gnome gtk3 installer"
+fi
+
+exit 0
\ No newline at end of file
diff --git a/CeibalEncuesta/gtk3/scripts/prepare_installers.sh b/CeibalEncuesta/gtk3/scripts/prepare_installers.sh
new file mode 100755
index 0000000..946c4df
--- /dev/null
+++ b/CeibalEncuesta/gtk3/scripts/prepare_installers.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+echo "Enter version number [example 4.2]: "
+read version
+
+sh prepare_xo_installer.sh $version
+
+echo "----------------------------------------------------------------------"
+
+sh prepare_gtk_installer.sh $version
+
+echo "-------------------------------- END ---------------------------------"
diff --git a/CeibalEncuesta/gtk3/scripts/prepare_xo_installer.sh b/CeibalEncuesta/gtk3/scripts/prepare_xo_installer.sh
new file mode 100755
index 0000000..a20fcd3
--- /dev/null
+++ b/CeibalEncuesta/gtk3/scripts/prepare_xo_installer.sh
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+XO_INSTALLER_PATH='../CeibalEncuesta.activity'
+CEIBAL_ENCUESTA_PATH='../CeibalEncuesta'
+INSTALLERS_PATH='../installers'
+version=$1
+
+if [ -z "$version" ]
+then
+    echo "You need enter version as first param, ex: ./prepare_xo_installer 4.2"
+    exit 1
+fi
+
+cp -r $CEIBAL_ENCUESTA_PATH/* $XO_INSTALLER_PATH/
+rm -rf `find ../ -type f -name '*.pyc'`
+rm -rf `find ../ -type f -name '*.pyo'`
+
+echo "YOU NEED REPLACE IN "$XO_INSTALLER_PATH"/CeibalEncuesta.py the follow:"
+echo ""
+
+function change_main_program {
+    while [ `grep -R "$3" ${XO_INSTALLER_PATH}/CeibalEncuesta.py | wc -l` -ne "1" ]
+    do
+        echo $1"- "$2
+        echo "    "$3
+        echo ""
+
+        echo "Do that and Enter to continue [ENTER]: "
+        read key
+    done
+}
+
+LINE='from sugar3.activity import activity'
+MSG='ADD:'
+change_main_program "1" "$MSG" "$LINE"
+
+LINE='class CeibalEncuesta(activity.Activity):'
+MSG='CeibalEncuesta class need inherit from: activity.Activity like that:'
+change_main_program "2" "$MSG" "$LINE"
+
+LINE='def __init__(self, handle):'
+MSG='Add handle argument into __init__ method like that:'
+change_main_program "3" "$MSG" "$LINE"
+
+LINE='activity.Activity.__init__(self, handle, False)'
+MSG='replace Gtk.Window.__init__(self) to:'
+change_main_program "4" "$MSG" "$LINE"
+
+if [ `grep -R "self.add(" ${XO_INSTALLER_PATH}/CeibalEncuesta.py | wc -l` -ne "0" ]
+    then
+        echo "5 - replace each ocurence of self.add to self.set_canvas Example: self.add(box) -> self.add to self.set_canvas(box)"
+        echo ""
+        echo "Do that and Enter to continue [ENTER]: "
+        read key
+fi
+
+while [ `grep -R "self.add(" ${XO_INSTALLER_PATH}/CeibalEncuesta.py | wc -l` -ne "0" ]
+do
+    echo "occurrences remain of self.add() method. You need replace for: self.set_canvas() method"
+    echo ""
+
+    echo "Do that and Enter to continue [ENTER]: "
+    read key
+done
+
+echo "#!/usr/bin/env python
+from sugar3.activity import bundlebuilder
+bundlebuilder.start()" > $XO_INSTALLER_PATH/setup.py
+echo "setup.py was added to "$XO_INSTALLER_PATH" path"
+echo ""
+
+while [ `grep -R "activity_version = $version" $XO_INSTALLER_PATH/activity/activity.info | wc -l` -ne "1" ]
+do
+    echo "You need edit activity_version = $version into "$XO_INSTALLER_PATH"/activity/activity.info"
+    echo "VERSION is version for you new deploy. Do that and Enter to continue [ENTER]:"
+    read key
+done
+
+chmod 755 $XO_INSTALLER_PATH
+chmod a+x $XO_INSTALLER_PATH/CeibalEncuesta.py
+chmod a+x $XO_INSTALLER_PATH/setup.py
+
+rm -f $INSTALLERS_PATH/CeibalEncuesta.activity-gtk3.xo
+
+cd .. && zip installers/CeibalEncuesta.activity-gtk3.xo `find CeibalEncuesta.activity -maxdepth 3`
+echo ""
+cd scripts; ls -al $INSTALLERS_PATH/CeibalEncuesta.activity-gtk3.xo
+
+if [ "$?" -ne "0" ]; then
+    echo "Fail: doing XO installer"
+    exit 1
+fi
+
+rm -rf `find $XO_INSTALLER_PATH |grep -v /activity |grep -v -w "CeibalEncuesta.activity$"`
+
+echo ""
+echo "DONE: CeibalEncuesta.activity-gtk3.xo was placed into installers directory."
+
+exit 0
\ No newline at end of file