Mailinglist Archive: opensuse-project (193 mails)

[Daniel Gollub <dgollub@xxxxxxx>]

On Tuesday 24 April 2007 11:05:16 Jordi Massaguer i Pla wrote:
> I am asking you some testing and feedback about it. You can download the
> latest builds from:
>
> http://instlux.sourceforge.net/testing_builds/
Hi Jordi,

Sascha and me have done some basic testing of your test builds. instlux works 
quite well so far. We can also verify that it is working for SATA harddisks. 
We discovered only some minor issues:

#1 Find Windows partion
find --set-root /autoexec.bat
This would break on several windows installation on different partions. Even 
on windows installation which don't have a "autoexec.bat" file in place. (At 
least one box i tested with a vendor customized Windows XP doesn't have one.)

We enhanced your nsis script so it create a "stamp file" to mark the Window 
partition which triggered the instlux installation:

find --set-root /instlux-hitme.txt
... should be very unique :)

(Feel free to rename the file in something more unique)

#2 Translations
Updated the German translation ... not quite sure about the quality of the 
other translations. Maybe you should make a call for proof reading.

#3 Use system screen resolution and selected language
instlux should now start the installation in the user chosen language. The 
installation system gets booted with vga=0xXXX parameter and splash=silent. 
The screen resolution from the Windows installation is used to determine the 
vga value. For some reason the splash screen is not working .. but i guess 
your initrd is customized and not the original one - right?

The nsis system plugin is required to get the system resolution  
http://nsis.sourceforge.net/System_plug-in

TODO: Some languages aren't handled yet in the nsis script.

#4 instlux grub - timeout 0
The grub of instlux boots know the installation immediately. No need to bother 
the user two times with different boot managers.

#5 Check minimum amount of RAM / Harddisk free space (TODO)
For the network installation builds instlux should check if the minimum amount 
of RAM is avaliable. If not instlux should give a warning. Maybe we could do 
something similar to check if enough harddisk space is left and give 
warnings.

#6 make_instlux.py changes
Don't call makensis with absolute path, my version is very very customized. 
Maybe we should provide a nsis package with all the required plugins in the 
oSBS.

All changes are attachted as patch from the latest revision of SVN. I hope you 
could commit them upstream. Beside the background color change to #7ac142 
this should be still distribution independent...

best regards,
Daniel
Index: translations/german/license_german.txt
===================================================================
--- translations/german/license_german.txt      (revision 18)
+++ translations/german/license_german.txt      (working copy)
@@ -2,7 +2,9 @@
 
 Autor: Jordi Massaguer Pla
 Mitwirkende:
-Die Leute, die hier verzeichnet werden, haben zum instlux, entweder durch Code beigetragen, indem sie Rückgespräch sendeten oder indem sie förderten.  Wenn du denkst, solltest du hier verzeichnet werden, schreibst ein email zu jordimassaguerpla@xxxxxxxxx
+
+Folgende Personen haben durch Code, Rücksprachen oder Förderungen zu instlux beigetragen. 
+Wenn Sie ebenfalls als Beigetragender erwähnt werden möchten, schreiben Sie eine E-Mail an jordimassaguerpla@xxxxxxxxx
 LIST_OF_CONTRIBUTORS
 
 Deutsche Übersetzung der
Index: src/instlux_template_en.nsi
===================================================================
--- src/instlux_template_en.nsi (revision 18)
+++ src/instlux_template_en.nsi (working copy)
@@ -59,8 +59,9 @@
   !include FileFunc.nsh ; GetRoot / un.GetRoot
   !insertmacro GetRoot
   !insertmacro un.GetRoot
-  BGGradient f8e409  
+  BGGradient 7ac142  
 
+
   !define MUI_ICON "instlux.ico"
   !define MUI_UNICON "instlux.ico"
   !define MUI_HEADERIMAGE
@@ -100,6 +101,9 @@
 var c
 var ConfigSYS
 var MenuLSTFile
+var HitMeFile
+var Resolution
+var LangParam
 
 Function .onInit
        # the plugins dir is automatically deleted when the installer exits
@@ -116,6 +120,7 @@
        Pop $0 ; $0 has '1' if the user closed the splash screen early,
                        ; '0' if everything closed normally, and '-1' if some error occurred.
        !insertmacro MUI_LANGDLL_DISPLAY
+
        
 FunctionEnd
 
@@ -171,10 +176,79 @@
   
   lbl_Common:
 
+  FileOpen $HitMeFile $c\instlux_hitme.txt a 
+  FileWrite $HitMeFile "This file was created by instlux."
+  FileSeek $HitMeFile 0 END
+  FileClose $HitMeFile
+
+# TODO add all avaliable languages
+  StrCmp $LANGUAGE ${LANG_ENGLISH} 0 +2
+    StrCpy $LangParam "en"
+  StrCmp $LANGUAGE ${LANG_DUTCH} 0 +2
+    StrCpy $LangParam "da"
+  StrCmp $LANGUAGE ${LANG_FRENCH} 0 +2
+    StrCpy $LangParam "fr"
+  StrCmp $LANGUAGE ${LANG_GERMAN} 0 +2
+    StrCpy $LangParam "de"
+#  StrCmp $LANGUAGE ${LANG_KOREAN} 0 +2
+#     StrCpy $LangParam "cr"
+#  StrCmp $LANGUAGE ${LANG_RUSSIAN} 0 +2
+#    StrCpy $LangParam "ru"
+  StrCmp $LANGUAGE ${LANG_SPANISH} 0 +2
+    StrCpy $LangParam "es"
+  StrCmp $LANGUAGE ${LANG_SWEDISH} 0 +2
+    StrCpy $LangParam "se"
+#  StrCmp $LANGUAGE ${LANG_TRADCHINESE} 0 +2
+#    StrCpy $LangParam "zh_TW"
+#  StrCmp $LANGUAGE ${LANG_SIMPCHINESE} 0 +2
+#    StrCpy $LangParam "zh_CN"
+#  StrCmp $LANGUAGE ${LANG_SLOVAK} 0 +2
+#    StrCpy $LangParam "sk"
+
+
+
+  # http://nsis.sourceforge.net/System_plug-in ;<--- requires
+  System::Call 'user32::GetSystemMetrics(i 0) i .r0'
+  System::Call 'user32::GetSystemMetrics(i 1) i .r1'
+
+
+
+  # 64k |  0x311    0x314    0x317    0x31A
+  IntCmp $0 640 is640 isUnknow 0
+  IntCmp $0 800 is800
+  IntCmp $0 1024 is1024
+  IntCmp $0 1280 is1280 0 is1280 
+
+  isUnknow:
+    StrCpy $Resolution "normal"
+  Goto writeMenu 
+       
+  is640:
+    StrCpy $Resolution "0x311"
+  Goto writeMenu  
+
+  is800:
+    StrCpy $Resolution "0x314"
+  Goto writeMenu
+
+  is1024:
+    StrCpy $Resolution "0x317"
+  Goto writeMenu  
+
+  is1280:
+    StrCpy $Resolution "0x31A"
+  Goto writeMenu  
+
+
+  writeMenu:
+
+
   FileOpen $MenuLSTFile $c\menu.lst a
+  FileWrite $MenuLSTFile "hiddenmenu $\r$\n"
+  FileWrite $MenuLSTFile "timeout 0 $\r$\n"
   FileWrite $MenuLSTFile "title MENU_TITLE $\r$\n"
-  FileWrite $MenuLSTFile "find --set-root /autoexec.bat$\r$\n"
-  FileWrite $MenuLSTFile "kernel   /distros/KERNEL KRNL_APPEND$\r$\n"
+  FileWrite $MenuLSTFile "find --set-root /instlux_hitme.txt$\r$\n"
+  FileWrite $MenuLSTFile "kernel   /distros/KERNEL KRNL_APPEND lang=$LangParam vga=$Resolution splash=silent$\r$\n"
   FileWrite $MenuLSTFile "initrd   /distros/DRIVERS$\r$\n"
   FileSeek $MenuLSTFile 0 END
   FileClose $MenuLSTFile
@@ -221,6 +295,7 @@
   lbl_Finish:
     RMDir /REBOOTOK /r "$c\distros\OUTPATH"
     Delete /REBOOTOK "$c\menu.lst"
+    Delete /REBOOTOK "$c\instlux_hitme.txt"
     Delete /REBOOTOK "$SMSTARTUP\instlux-uninst.exe"
   
 SectionEnd
Index: make_instlux.py
===================================================================
--- make_instlux.py     (revision 18)
+++ make_instlux.py     (working copy)
@@ -27,7 +27,7 @@
 
 build = "build"
 #nsis_bin = '"c:\Program Files\NSIS\makensis.exe"'
-nsis_bin = '"/usr/bin/makensis"'
+nsis_bin = '"makensis"'
 instlux_ico = "instlux.ico"
 instlux_logo = "instlux_logo.bmp"
 grub4dos = ["grldr","grub.exe"]