Changeset 17

Timestamp:

Mar 22, 2018, 9:32:50 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build deb package with project in Release mode.
• Fixed: Search locales in different location if installed as linux application.

Location:

trunk

Files:

• DbEngines/UEngineXML.pas (modified) (1 diff)
• Forms/UFormMain.pas (modified) (1 diff)
• Install/deb/debian/control (modified) (1 diff)
• Install/deb/debian/rules (modified) (1 diff)
• MyData.lpi (modified) (1 diff)
• UCore.pas (modified) (1 diff)

trunk/DbEngines/UEngineXML.pas

@@ -309 +309 @@
     if Command = 'FROM' then begin
       TableName := GetNextPart(Text);
-    end;
+    end else raise Exception.Create('No table specified with FROM');
     Table := Database.Tables.SearchByName(TableName);
     if Assigned(Table) then begin

trunk/Forms/UFormMain.pas

@@ -37 +37 @@
 var
   FormMain: TFormMain;
+
 
 implementation

trunk/Install/deb/debian/control

@@ -3 +3 @@
 Section: utils
 Priority: optional
-Standards-Version: 1.5.0
+Standards-Version: 1.0.0
 Build-Depends: fpc, lazarus, lcl, lcl-utils, debhelper (>= 8)
 

trunk/Install/deb/debian/rules

@@ -11 +11 @@
 
 override_dh_auto_build:
-        lazbuild --build-mode=Release --cpu=$DEB_TARGET_ARCH_CPU --operating-system=$DEB_TARGET_ARCH_OS MyData.lpi
+        lazbuild --build-mode=Release MyData.lpi
 
 override_dh_auto_install:

trunk/MyData.lpi

@@ -28 +28 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="Forms"/>
+            <OtherUnitFiles Value="Forms;DbEngines;/usr/lib/mysql/;/usr/lib64/mysql/"/>
             <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
           </SearchPaths>

trunk/UCore.pas

@@ -224 +224 @@
 begin
   if not Initialized then begin
+    {$IFDEF Linux}
+    // If installed in Linux system then use installation directory for po files
+    if Application.ExeName = '/usr/bin/MyData' then
+      CoolTranslator1.POFilesFolder := '/usr/share/MyData/languages';
+    {$ENDIF}
     InitDataTypes;
     InitEngines;