diff options
Diffstat (limited to 'nautilus-installer')
-rw-r--r-- | nautilus-installer/src/HACKING | 37 | ||||
-rw-r--r-- | nautilus-installer/src/Makefile | 11 | ||||
-rw-r--r-- | nautilus-installer/src/Makefile.am | 3 | ||||
-rw-r--r-- | nautilus-installer/src/installer.c | 55 | ||||
-rw-r--r-- | nautilus-installer/src/interface.c | 4 | ||||
-rwxr-xr-x | nautilus-installer/src/link.sh | 17 | ||||
-rw-r--r-- | nautilus-installer/src/prescript | 6 |
7 files changed, 38 insertions, 95 deletions
diff --git a/nautilus-installer/src/HACKING b/nautilus-installer/src/HACKING index c982c4a12..5f0e0b0a1 100644 --- a/nautilus-installer/src/HACKING +++ b/nautilus-installer/src/HACKING @@ -1,38 +1,5 @@ link.sh will build the statically linked version, plus strip gzexe and patch prescript into it. -This command will statically link all the gnome shit into the installer, but leave the rpm, db, z, bz and -generic X crap as shared libs - -gcc -static -o nautilus-installer main.o support.o interface.o callbacks.o installer.o \ -/gnome-source/nautilus/components/services/trilobite/libtrilobite/helixcode-utils.o \ -/gnome-source/nautilus/components/services/install/lib/libinstall.a \ --L/gnome/lib \ --lgnomeui \ --lgnome \ --lart_lgpl \ --lgdk_imlib \ --lgtk \ --lgdk \ --lgmodule \ --lglib \ --L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE \ -/usr/lib/libesd.a \ -/usr/lib/libaudiofile.a \ --lghttp \ --L/usr/lib -lrpm -lz -ldb1 \ -/usr/lib/libpopt.a \ --lxml - - -The gzexed file should have skip=22 replaced with - -skip=28 -if test $UID -ne 0; then - xhost + localhost - su - -c "export DISPLAY=$DISPLAY && cd $PWD && sh $0" - xhost - localhost - exit -fi - -this causes it not to require root access before running +to build, you must also compile nautilus/components/services/install/lib with +-DEAZEL_INSTALL_NO_CORBA, to create a minimalistic corbafree libinstall_base. diff --git a/nautilus-installer/src/Makefile b/nautilus-installer/src/Makefile index 55790660c..56a05febc 100644 --- a/nautilus-installer/src/Makefile +++ b/nautilus-installer/src/Makefile @@ -113,9 +113,9 @@ LN_S = ln -s MAINT = MAKEINFO = makeinfo MKINSTALLDIRS = ./mkinstalldirs -MOZILLA_COMPONENT_CFLAGS = -I/usr/include/mozilla -MOZILLA_COMPONENT_LDFLAGS = -L/usr/lib/mozilla -MOZILLA_COMPONENT_LIBS = -lgtkembedmoz -lgtksuperwin -lxpcom -lnspr4 -lplc4 -lplds4 +MOZILLA_COMPONENT_CFLAGS = +MOZILLA_COMPONENT_LDFLAGS = +MOZILLA_COMPONENT_LIBS = NM = /usr/bin/nm -B OAF_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include OAF_CONFIG = /gnome/bin/oaf-config @@ -159,7 +159,7 @@ nautilus_installer_SOURCES = main.c support.c support.h interface.c interfac nautilus_installer_LDFLAGS = -static -nautilus_installer_LDADD = $(top_builddir)/components/services/trilobite/libtrilobite/helixcode-utils.o $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o $(top_builddir)/components/services/install/lib/libinstall.a -L/gnome/lib -lgnomeui -lgnome -lart_lgpl -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE /usr/lib/libesd.a /usr/lib/libaudiofile.a -lghttp -L/usr/lib -lrpm -lz -ldb1 -lpopt -lxml +nautilus_installer_LDADD = $(top_builddir)/components/services/trilobite/libtrilobite/helixcode-utils.o $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o $(top_builddir)/components/services/install/lib/libinstall_gtk.a $(top_builddir)/components/services/install/lib/libinstall_base.a -L/gnome/lib -lgnomeui -lgnome -lart_lgpl -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE /usr/lib/libesd.a /usr/lib/libaudiofile.a -lghttp -L/usr/lib -lrpm -lz -ldb1 -lpopt -lxml mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -176,7 +176,8 @@ installer.o nautilus_installer_DEPENDENCIES = \ $(top_builddir)/components/services/trilobite/libtrilobite/helixcode-utils.o \ $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o \ -$(top_builddir)/components/services/install/lib/libinstall.a \ +$(top_builddir)/components/services/install/lib/libinstall_gtk.a \ +$(top_builddir)/components/services/install/lib/libinstall_base.a \ /usr/lib/libesd.a /usr/lib/libaudiofile.a COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/nautilus-installer/src/Makefile.am b/nautilus-installer/src/Makefile.am index 624374a1b..2634d2f7c 100644 --- a/nautilus-installer/src/Makefile.am +++ b/nautilus-installer/src/Makefile.am @@ -31,7 +31,8 @@ nautilus_installer_LDFLAGS = -static nautilus_installer_LDADD = \ $(top_builddir)/components/services/trilobite/libtrilobite/helixcode-utils.o \ $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o \ - $(top_builddir)/components/services/install/lib/libinstall.a \ + $(top_builddir)/components/services/install/lib/libinstall_gtk.a \ + $(top_builddir)/components/services/install/lib/libinstall_base.a \ -L/gnome/lib \ -lgnomeui \ -lgnome \ diff --git a/nautilus-installer/src/installer.c b/nautilus-installer/src/installer.c index 8b3deaabe..967c1da3c 100644 --- a/nautilus-installer/src/installer.c +++ b/nautilus-installer/src/installer.c @@ -9,13 +9,12 @@ #include <sys/utsname.h> -#define HOSTNAME "toothgnasher.eazel.com" +#define HOSTNAME "testmachine.eazel.com" #define PORT_NUMBER 80 #define PROTOCOL PROTOCOL_HTTP #define TMP_DIR "/tmp/eazel-install" #define RPMRC "/usr/lib/rpm/rpmrc" #define REMOTE_RPM_DIR "/RPMS" -#define PACKAGE_LIST "package-list.xml" static char *package_list[LAST] = { "/package-list.xml", @@ -168,45 +167,6 @@ install_failed (EazelInstall *service, } } -static PackageData* -create_package (char *name) -{ - struct utsname buf; - PackageData *pack; - - uname (&buf); - pack = packagedata_new (); - pack->name = g_strdup (name); - pack->archtype = g_strdup (buf.machine); - - if (strlen (pack->archtype)==4 && pack->archtype[0]=='i' && - pack->archtype[1]>='3' && pack->archtype[1]<='9' && - pack->archtype[2]=='8' && pack->archtype[3]=='6') { - g_free (pack->archtype); - pack->archtype = g_strdup ("i386"); - } - - pack->distribution = trilobite_get_distribution (); - pack->toplevel = TRUE; - return pack; -} - -static GList * -create_categories () -{ - GList *categories; - CategoryData *cat; - GList *packages; - - packages = g_list_prepend (NULL, create_package("nautilus")); - cat = g_new0 (CategoryData,1); - cat->name = g_strdup ("Nautilus"); - cat->packages = packages; - categories = g_list_prepend (NULL, cat); - - return categories; -} - void installer (GtkWidget *window, gint method) { @@ -223,7 +183,7 @@ void installer (GtkWidget *window, "verbose", TRUE, "silent", FALSE, "debug", TRUE, - "test", TRUE, //FALSE, + "test", FALSE, "force", FALSE, "depend", FALSE, "update", method==UPGRADE ? TRUE : FALSE, @@ -235,19 +195,18 @@ void installer (GtkWidget *window, "hostname", HOSTNAME, "rpm_storage_path", REMOTE_RPM_DIR, "package_list_storage_path", package_list [ method ], - "package_list", PACKAGE_LIST, "port_number", PORT_NUMBER, NULL)); service = eazel_install_new_with_config ("/var/eazel/services/eazel-services-config.xml"); g_assert (service != NULL); - eazel_install_set_hostname (service, HOSTNAME); + eazel_install_set_server (service, HOSTNAME); eazel_install_set_rpmrc_file (service, RPMRC); eazel_install_set_package_list_storage_path (service, "/package-list.xml"); eazel_install_set_rpm_storage_path (service, REMOTE_RPM_DIR); eazel_install_set_tmp_dir (service, TMP_DIR); - eazel_install_set_port_number (service, PORT_NUMBER); + eazel_install_set_server_port (service, PORT_NUMBER); eazel_install_set_protocol (service, PROTOCOL); g_assert (service != NULL); @@ -264,7 +223,7 @@ void installer (GtkWidget *window, case NAUTILUS_ONLY: case SERVICES_ONLY: case UPGRADE: - eazel_install_install_packages (service, create_categories ()); + eazel_install_install_packages (service, NULL); break; case UNINSTALL: eazel_install_uninstall (service); @@ -278,5 +237,7 @@ void installer (GtkWidget *window, gtk_label_set_text (package_label, "Completed :"); gtk_progress_bar_update (progressbar, 1); - gnome_error_dialog_parented (failure_info, GTK_WINDOW (window)); + if (strlen (failure_info)>1) { + gnome_error_dialog_parented (failure_info, GTK_WINDOW (window)); + } } diff --git a/nautilus-installer/src/interface.c b/nautilus-installer/src/interface.c index d11cd1a5b..9a0021546 100644 --- a/nautilus-installer/src/interface.c +++ b/nautilus-installer/src/interface.c @@ -87,7 +87,7 @@ create_window (void) gnome_druid_page_start_set_logo_bg_color (GNOME_DRUID_PAGE_START (start_page), &start_page_logo_bg_color); gnome_druid_page_start_set_title_color (GNOME_DRUID_PAGE_START (start_page), &start_page_title_color); gnome_druid_page_start_set_title (GNOME_DRUID_PAGE_START (start_page), _("Step one:")); - gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (start_page), _("This is the internal Nautilus installer.\n\nLots of text should go here letting you know what you need\nto have installed before you should even begin to think about\nusing this. For example:\n\n * Helix Gnome\n * GTK+ Development Environment\n * Other stuff\n\nIf you meet these requirements, hit the \"Next\" button to continue!\n\n")); + gnome_druid_page_start_set_text (GNOME_DRUID_PAGE_START (start_page), _("This is the internal Nautilus installer.\n\nLots of text should go here letting you know what you need\nto have installed before you should even begin to think about\nusing this. For example:\n\n * Stuff\n * More stuff\n * Other stuff\n\nIf you meet these requirements, hit the \"Next\" button to continue!\n\n")); what_to_do_page = gnome_druid_page_standard_new_with_vals ("", NULL); @@ -222,7 +222,7 @@ create_window (void) gtk_widget_show (vbox5); gtk_box_pack_start (GTK_BOX (druid_vbox2), vbox5, TRUE, TRUE, 0); - label11 = gtk_label_new (_("Press the big begin, and watch the installer is do it's thing...")); + label11 = gtk_label_new (_("Press the big begin button, and watch the installer do it's thing...")); gtk_widget_set_name (label11, "label11"); gtk_widget_ref (label11); gtk_object_set_data_full (GTK_OBJECT (window), "label11", label11, diff --git a/nautilus-installer/src/link.sh b/nautilus-installer/src/link.sh index 0f19def77..2cb4d3623 100755 --- a/nautilus-installer/src/link.sh +++ b/nautilus-installer/src/link.sh @@ -1,7 +1,14 @@ #! /bin/bash make clean make CFLAGS="-O -Werror" LDFLAGS="-static" -gcc -static -O -Werror -o nautilus-installer main.o support.o interface.o callbacks.o installer.o ../../components/services/trilobite/libtrilobite/helixcode-utils.o ../../components/services/trilobite/libtrilobite/trilobite-core-distribution.o ../../components/services/install/lib/libinstall.a -L/gnome/lib -lgnomeui -lgnome -lart_lgpl -lgdk_imlib -lgtk -lgdk -lgmodule -lglib -L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE /usr/lib/libesd.a /usr/lib/libaudiofile.a -lghttp -L/usr/lib -lrpm -lz -ldb1 -lpopt -lxml +gcc -static -O -Werror -o nautilus-installer main.o support.o interface.o callbacks.o installer.o \ +../../components/services/trilobite/libtrilobite/helixcode-utils.o \ +../../components/services/trilobite/libtrilobite/trilobite-core-distribution.o \ +../../components/services/install/lib/libinstall_base.a \ +../../components/services/install/lib/libinstall_gtk.a \ +-L/gnome/lib -lgnomeui -lgnome -lart_lgpl -lgdk_imlib -lgtk -lgdk -lgmodule -lglib \ +-L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE /usr/lib/libesd.a /usr/lib/libaudiofile.a -lghttp \ +-L/usr/lib -lrpm -lbz2 -lz -ldb1 -lpopt -lxml echo Stripping... strip nautilus-installer @@ -12,9 +19,9 @@ echo Patching... chmod 644 nautilus-installer mv nautilus-installer hest extraskip=`expr 22 + \`wc -l prescript|awk '{printf $1"\n"}'\`` -echo "#!/bin/sh" > nautilus-installer -echo "skip=$extraskip" >> nautilus-installer -cat prescript >> nautilus-installer -tail +3 hest >> nautilus-installer +echo "#!/bin/sh" > nautilus-installer.sh +echo "skip=$extraskip" >> nautilus-installer.sh +cat prescript >> nautilus-installer.sh +tail +3 hest >> nautilus-installer.sh rm hest echo Done... diff --git a/nautilus-installer/src/prescript b/nautilus-installer/src/prescript index 1e322e708..c57d255e7 100644 --- a/nautilus-installer/src/prescript +++ b/nautilus-installer/src/prescript @@ -3,8 +3,14 @@ if test x$DISPLAY = x; then fi if test $UID -ne 0; then echo "" + echo "Nautilus-Installer v 0.1c" + echo "" + echo "argle bargle glob glyf muhainapuniua bork bork bork" + echo "fisk er dumme og heste er grimme" + echo "" echo "The Nautilus-Installer requires superuser access to install packages." echo "yadayada insecure yadayada trust us blablabla" + echo "we would never hurt a fly arglebargle." echo "" echo "Please enter root password at the prompt" xhost + localhost |