[Vectorlinux-devel] [vinstall-ng commit] r190 - in branches/iVL: . .lang

[<cod...@go...>]

Author: m0e.lnx
Date: Tue Sep 30 06:43:48 2008
New Revision: 190

Modified:
    branches/iVL/.lang/FMain.pot
    branches/iVL/FMain.class
    branches/iVL/FrmLangSel.class
    branches/iVL/MdlInstallSys.module

Log:
Added code to write /etc/vector-version

Modified: branches/iVL/.lang/FMain.pot
==============================================================================
--- branches/iVL/.lang/FMain.pot	(original)
+++ branches/iVL/.lang/FMain.pot	Tue Sep 30 06:43:48 2008
@@ -14,43 +14,43 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"

-#: FMain.class:232
+#: FMain.class:229
  msgid "Please wait while setup attampts to run the partitioning utility"
  msgstr ""

-#: FMain.class:234
+#: FMain.class:231
  msgid "Please wait while setup analyses your current partition setup."
  msgstr ""

-#: FMain.class:234
+#: FMain.class:231
  msgid "This may take a while ..."
  msgstr ""

-#: FMain.class:248
+#: FMain.class:245
  msgid "You must select a \"/\" partition. This is the target where the  
system will install to"
  msgstr ""

-#: FMain.class:303
+#: FMain.class:300
  msgid "Skipping lilo setup"
  msgstr ""

-#: FMain.class:406
+#: FMain.class:404
  msgid "Process Overview"
  msgstr ""

-#: FMain.class:426
+#: FMain.class:424
  msgid "Next"
  msgstr ""

-#: FMain.class:432
+#: FMain.class:430
  msgid "Back"
  msgstr ""

-#: FMain.class:438
+#: FMain.class:436
  msgid "Exit Installation"
  msgstr ""

-#: FMain.class:454
+#: FMain.class:452
  msgid "Button1"
  msgstr ""


Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class	(original)
+++ branches/iVL/FMain.class	Tue Sep 30 06:43:48 2008
@@ -67,11 +67,6 @@
  MdlCore.PREPARE_INSTALL_LAYOUT


-'STOP EVENT
-' ME.Width = 800
-' ME.Height = 600
-'
-

  WITH ME
    .btback.Enabled = FALSE
@@ -92,6 +87,7 @@
    END IF
   UNTIL FMain.tvPlan.MoveBelow()
   'Message(iWidth)
+FMain.btnext.Enabled = FALSE ' disable the button until a language is  
selected

  END

@@ -227,6 +223,7 @@
          ' The next form is defined from the radio buttons in Frm  
PartScheme. But let's see if we can display some status text

          'FMain.MovieBox1.Refresh
+
          WITH FrmPartScheme
            IF .rbEditPartitions.Value = TRUE THEN
              .tlChoiceExp.text = .tlChoiceExp.text & gb.NewLine &  
gb.NewLine & "<h3><br><br>" & ("Please wait while setup attampts to run the  
partitioning utility") & "</h3>"
@@ -286,7 +283,7 @@

      'POST INSTALL CONFIGURATION
      CASE "FrmInstallSys"
-
+      MdlInstallSys.WRITE_NEW_DISTRO_ID()
        frmNext = FrmLilo

      CASE "FrmLilo"
@@ -343,6 +340,7 @@
        IF FrmCurr.Name <> "FrmDiskPart" THEN
      IF ClsGlobal.sBackNav.Find(frmNext) = -1 THEN
      ClsGlobal.sBackNav.Add(frmNext)
+    '  IF ClsGlobal.sBackNav.Find(FrmCurr) = -1 THEN  
ClsGlobal.sBackNav.Add(FrmCurr)
      END IF
      END IF
    frmNext.Show

Modified: branches/iVL/FrmLangSel.class
==============================================================================
--- branches/iVL/FrmLangSel.class	(original)
+++ branches/iVL/FrmLangSel.class	Tue Sep 30 06:43:48 2008
@@ -19,6 +19,7 @@

  PUBLIC SUB Form_Open()

+
    FMain.tvPlan["Prep0"].Selected = TRUE

    FMain.FrmCurr = ME
@@ -45,5 +46,11 @@
      .lbLangSel.Move(8, .tlBanner.top + .tlBanner.Height + 4)
      .lbLangSel.Resize((ME.Width / 3), ME.Height - (.tlBanner.Height * 2))
    END WITH
+
+END
+
+PUBLIC SUB lbLangSel_Select()
+
+  FMain.btnext.Enabled = TRUE

  END

Modified: branches/iVL/MdlInstallSys.module
==============================================================================
--- branches/iVL/MdlInstallSys.module	(original)
+++ branches/iVL/MdlInstallSys.module	Tue Sep 30 06:43:48 2008
@@ -78,6 +78,24 @@
        END IF
  END

+PUBLIC SUB WRITE_NEW_DISTRO_ID()
+
+  DIM sBuildDate AS String
+  DIM sContent AS String
+
+  SHELL "cat " & ClsGlobal.sSourceMnt &/ "veclinux" &/ "SETUP.CONF | grep  
^builddate | cut -f 2 -d \'=\'" TO sBuildDate
+    sBuildDate = Trim(sBuildDate)
+      sBuildDate = Replace(sBuildDate, "\"", "")
+      sBuildDate = Replace(sBuildDate, "\'", "")
+
+    sContent = ClsGlobal.DISTRO & Space(1) & ClsGlobal.VERSION & Space(1)  
& "Built on" & Space(1) & sBuildDate
+        File.Save(ClsGlobal.sTargetMnt &/ "etc" &/ "vector-version",  
SConv(sContent))
+    'Message.Info(sContent)
+
+END
+
+
+

  PUBLIC FUNCTION WRITE_NEW_FSTAB() AS Integer