GUICreateBlackBox.bbs fixed + Names harmonized with GUICreatePackage

diff --git a/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs b/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
index c07f0b173ac450d9e2dcf86b29d9effcc2b13f71..a23fc3c25ea9e5bf298f775b9db97b56929025d3 100644 (file)
--- a/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
+++ b/packages/toolsbbtk/bbs/appli/GUICreateBlackBox.bbs
@@ -13,11 +13,11 @@ new DirectorySelector dir
 
 new InputText nameBlackbox
     set nameBlackbox.Title "Blackbox name         (1 word)"
-    set nameBlackbox.In "NEW_BLACKBOX"
+    set nameBlackbox.In "BLACKBOX_NAME"
 
 new InputText namePackage
     set namePackage.Title "Package name         (1 word)"
-    set namePackage.In "__PACKAGE__"
+    set namePackage.In "PACKAGE_NAME"
 
 
 new InputText author
@@ -97,76 +97,96 @@ new LayoutLine main
 
 #---------------------------------------------------------------------
 
-new ASCII ascii
-  set ascii.In 34
 
+#-----------------------------------------------------------------------------
+new Configuration conf
+# on windows : enclose paths between double quotes 
+# if system==0 (Linux) dquote=space (ascci code 32)
+# if system==1 (Win) dquote==" (ascii code 34)
+new StringSelect onsystem
+set onsystem.In0 "32"
+set onsystem.In1 "34"
+new ASCII dquote
+connect conf.SystemType onsystem.In
+connect onsystem.Out dquote.In
+#set dquote.In 34
+
+# directory
 new ConcatStrings dirStr
  set dirStr.In1 " "
- connect ascii.Out dirStr.In2
+ connect dquote.Out dirStr.In2
  connect dir.Out dirStr.In3
- connect ascii.Out dirStr.In4
+ connect dquote.Out dirStr.In4
  set dirStr.In5 " "
 
+# package name
 new ConcatStrings packageNameStr
- connect namePackage.Out packageNameStr.In1
- set packageNameStr.In2 " "
+ set packageNameStr.In1 "  "
+ connect namePackage.Out packageNameStr.In2
+ set packageNameStr.In3 " "
 
+# black box name
 new ConcatStrings blackboxNameStr
- connect nameBlackbox.Out blackboxNameStr.In1
- set blackboxNameStr.In2 " "
+ set blackboxNameStr.In1 "  "
+ connect nameBlackbox.Out blackboxNameStr.In2
+ set blackboxNameStr.In3 " "
 
+# type of black box
 new ConcatStrings typeStr
- connect stringselectorType.Out typeStr.In1
- set typeStr.In2 " "
+ set typeStr.In1 "  "
+ connect stringselectorType.Out typeStr.In2
+ set typeStr.In3 " "
 
+# format of output 
 new ConcatStrings formatStr
- connect stringselectorFormat.Out formatStr.In1
- set formatStr.In2 " "
+ set formatStr.In1 "  "
+ connect stringselectorFormat.Out formatStr.In2
+ set formatStr.In3 " "
 
+# author
 new ConcatStrings authorStr
  set authorStr.In1 " '"
  connect author.Out authorStr.In2
  set authorStr.In3 "' "
 
+# description
 new ConcatStrings descriptionStr
  set descriptionStr.In1 " '"
  connect description.Out descriptionStr.In2
  set descriptionStr.In3 "' "
 
-new Configuration conf
-
-new ConcatStrings commandStr
-    set                                commandStr.In1 " "
-    connect ascii.Out          commandStr.In2
-    connect conf.BinPath       commandStr.In3
-    connect conf.FileSeparator commandStr.In4
-    set                                commandStr.In5 "bbCreateBlackBox"
-    connect ascii.Out          commandStr.In6
-    set                                commandStr.In7 " "
-
-
+# Command string creation
+new ConcatStrings concatStrCommand
+    set concatStrCommand.In1 " "
+    connect dquote.Out                 concatStrCommand.In2
+    connect conf.BinPath               concatStrCommand.In3
+    connect conf.FileSeparator concatStrCommand.In4
+    set                concatStrCommand.In5  "bbCreateBlackBox"
+    connect dquote.Out                 concatStrCommand.In6
+    set                concatStrCommand.In7  " "
+
+# Params string creation
+new ConcatStrings concatStrParam
+    connect dirStr.Out                 concatStrParam.In1
+    connect packageNameStr.Out concatStrParam.In2
+    connect blackboxNameStr.Out        concatStrParam.In3
+    connect typeStr.Out                        concatStrParam.In4
+    connect formatStr.Out              concatStrParam.In5
+    connect authorStr.Out              concatStrParam.In6
+    connect descriptionStr.Out concatStrParam.In7
+    
+# Command + parameters string creation
 new ConcatStrings concatStr
-    connect  commandStr.Out                    concatStr.In1 
-    connect dirStr.Out                         concatStr.In2 
-    connect packageNameStr.Out concatStr.In3 
-    connect blackboxNameStr.Out        concatStr.In4
-    connect typeStr.Out                                concatStr.In5
-    connect formatStr.Out                      concatStr.In6
-    connect authorStr.Out                      concatStr.In7
-    connect descriptionStr.Out                 concatStr.In8
-
-/*
-LG : bug on linux 
-new ConcatStrings concatStr2
-    connect  ascii.Out                         concatStr2.In1 
-    connect concatStr.Out                      concatStr2.In2 
-    connect ascii.Out                          concatStr2.In3
-*/
+    connect dquote.Out                         concatStr.In1
+    connect concatStrCommand.Out       concatStr.In2
+    connect concatStrParam.Out                 concatStr.In3
+    connect dquote.Out                         concatStr.In4
 
+# Box which executes the command
 new ExecSystemCommand command
-//    connect concatStr2.Out command.In
     connect concatStr.Out command.In
 
+
 exec dir
 exec main
 

diff --git a/packages/toolsbbtk/bbs/appli/GUICreatePackage.bbs b/packages/toolsbbtk/bbs/appli/GUICreatePackage.bbs
index 896fe064f2e56a209b04724d9ec4da436b06611b..8e006e9ebde0f7e48e4c5368f253cbdd803a1884 100644 (file)
--- a/packages/toolsbbtk/bbs/appli/GUICreatePackage.bbs
+++ b/packages/toolsbbtk/bbs/appli/GUICreatePackage.bbs
@@ -18,7 +18,7 @@ new OutputText windowTitle
 
 new InputText name
     set name.Title "Name         (1 word)"
-    set name.In "NEW_PACKAGE"
+    set name.In "PACKAGE_NAME"
 
 new InputText author
     set author.Title "Author(s)           "
@@ -107,7 +107,7 @@ new ConcatStrings concatStrCommand
 
 new ConcatStrings concatStr
     connect dquote.Out                 concatStr.In1
-    connect  concatStrCommand.Out      concatStr.In2
+    connect concatStrCommand.Out       concatStr.In2
     connect dirStr.Out                 concatStr.In3
     connect nameStr.Out                        concatStr.In4 
     connect authorStr.Out              concatStr.In5