Templater: Fix Pascal projects

diff --git a/mop/project/templater.pl b/mop/project/templater.pl
index bd48da18c0e722db51a2fb493c4860501db546d3..c745cfd3340dde4b29f635d805943874c3192c48 100755 (executable)
--- a/mop/project/templater.pl
+++ b/mop/project/templater.pl
@@ -25,7 +25,7 @@ sub create_template($$$$) {
                "$taskdir/$task/$task.cpp" => "$task.cpp",
        },
        pas => {
                "$taskdir/$task/$task.cpp" => "$task.cpp",
        },
        pas => {

-               "$where/template-pas.lpi" => "${task}_main.lpi",
+               "$where/template-pas.lpi" => "${task}.lpi",

                "$taskdir/$task/$task.pas" => "$task.pas",
        }
     );
                "$taskdir/$task/$task.pas" => "$task.pas",
        }
     );


@@ -60,8 +60,8 @@ sub open_project($) {
 
 sub existing_projects($) {
     my ($lopen_data,$lang)=@_;
 
 sub existing_projects($) {
     my ($lopen_data,$lang)=@_;

-    foreach ((glob "$home/*/*.cbp"), (glob "$home/*/*.lpr")) {
-       my ($name, $task) = m#.*/(.*?)/(.*)(_main\.lpr|\.cbp)#;
+    foreach ((glob "$home/*/*.cbp"), (glob "$home/*/*.lpi")) {
+       my ($name, $task) = m#.*/(.*?)/(.*)(\.lpi|\.cbp)#;

        print "$name $task\n";
        $lang=-f "$home/$name/$task.c" ? 'C' : -f "$home/$name/$task.cpp" ? 'C++' : -f "$home/$name/$task.pas" ? 'Pascal' : '';
        $lopen_data->set($lopen_data->append, 0, "$1", 1, $lang);
        print "$name $task\n";
        $lang=-f "$home/$name/$task.c" ? 'C' : -f "$home/$name/$task.cpp" ? 'C++' : -f "$home/$name/$task.pas" ? 'Pascal' : '';
        $lopen_data->set($lopen_data->append, 0, "$1", 1, $lang);

diff --git a/mop/project/templater/template-pas.lpi b/mop/project/templater/template-pas.lpi
index 72168b3a4bbbd907fa7eb09f8e827de5234ce9af..51220d27f79f2d098aea33fe51a396ed60931028 100644 (file)
--- a/mop/project/templater/template-pas.lpi
+++ b/mop/project/templater/template-pas.lpi
@@ -9,7 +9,7 @@
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>

-      <Title Value="tASk_main"/>
+      <Title Value="tASk"/>

       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
     </General>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
     </General>