added printer4lazarus and cgilaz to bigide

git-svn-id: trunk@8413 -

.gitattributes

@@ -1,6 +1,8 @@
 * text=auto !eol
 /COPYING.modifiedLGPL -text svneol=unset#application/octet-stream
 components/README.txt svneol=native#text/plain
+components/cgi/Makefile svneol=native#text/plain
+components/cgi/Makefile.fpc svneol=native#text/plain
 components/cgi/cgilaz.lpk svneol=native#text/pascal
 components/cgi/cgimodules.pas svneol=native#text/pascal
 components/cgi/ide/README.txt svneol=native#text/plain
@@ -208,6 +210,8 @@ components/prettyformat/pfidesource.pas svneol=native#text/plain
 components/prettyformat/prettyformat.lpk svneol=native#text/plain
 components/prettyformat/prettyformat.pas svneol=native#text/plain
 components/prettyformat/ptopu.pp svneol=native#text/plain
+components/printers/Makefile svneol=native#text/plain
+components/printers/Makefile.fpc svneol=native#text/plain
 components/printers/linux/cupsdyn.pp svneol=native#text/pascal
 components/printers/linux/cupsprinters.inc svneol=native#text/pascal
 components/printers/linux/cupsprinters_h.inc svneol=native#text/pascal
@@ -557,6 +561,7 @@ doceditor/lazdeopts.pp svneol=native#text/pascal
 doceditor/pgeditor.pp svneol=native#text/pascal
 doceditor/pkedit.pp svneol=native#text/pascal
 doceditor/pkeditor.pp svneol=native#text/pascal
+docs/BigIDE.txt svneol=native#text/plain
 docs/Contributors.txt svneol=native#text/plain
 docs/CrossCompile.txt svneol=native#text/plain
 docs/DesignGuidelines.txt svneol=native#text/plain

components/Makefile

@@ -1739,5 +1739,5 @@ include fpcmake.loc
 endif
 .phony: bigidecomponents
 bigidecomponents: all
-	$(MAKE) -C rtticontrols
+	$(MAKE) -C rtticontrols printers cgi
 cleanlaz: clean

components/Makefile.fpc

@@ -21,6 +21,6 @@ files=$(wildcard ./units/*$(OEXT)) \
 .phony: bigidecomponents
 
 bigidecomponents: all
-        $(MAKE) -C rtticontrols
+        $(MAKE) -C rtticontrols printers cgi
 
 cleanlaz: clean

components/cgi/Makefile.fpc

@@ -0,0 +1,27 @@
+#   Makefile.fpc for cgiLaz 0.1.1
+
+[package]
+name=cgilaz
+version=0.1.1
+
+[compiler]
+unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)/
+unitdir=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/gtk2/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+options=-gl
+
+[target]
+units=cgilaz.pas
+
+[clean]
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+
+[rules]
+.PHONY: cleartarget all
+
+cleartarget:
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/cgilaz$(PPUEXT)
+
+all: cleartarget $(COMPILER_UNITTARGETDIR) cgilaz$(PPUEXT)

components/cgi/cgilaz.lpk

@@ -4,11 +4,16 @@
     <Name Value="cgiLaz"/>
     <Author Value="Mattias Gaertner"/>
     <CompilerOptions>
+      <Version Value="5"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib/"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
       </SearchPaths>
+      <CodeGeneration>
+        <Generate Value="Faster"/>
+      </CodeGeneration>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
+        <CreateMakefileOnBuild Value="True"/>
       </Other>
     </CompilerOptions>
     <Description Value="cgi applications with data modules"/>

components/printers/Makefile.fpc

@@ -0,0 +1,27 @@
+#   Makefile.fpc for Printer4Lazarus 0.0.0.2
+
+[package]
+name=printer4lazarus
+version=0.0.0.2
+
+[compiler]
+unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
+unitdir=$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/gtk/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
+options=-gl
+
+[target]
+units=printer4lazarus.pas
+
+[clean]
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+
+[rules]
+.PHONY: cleartarget all
+
+cleartarget:
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/printer4lazarus$(PPUEXT)
+
+all: cleartarget $(COMPILER_UNITTARGETDIR) printer4lazarus$(PPUEXT)

components/printers/printer4lazarus.lpk

@@ -1,16 +1,14 @@
 <?xml version="1.0"?>
 <CONFIG>
   <Package Version="2">
-    <PathDelim Value="\"/>
     <Name Value="Printer4Lazarus"/>
     <Author Value="Olivier Guilbaud"/>
     <CompilerOptions>
       <Version Value="5"/>
-      <PathDelim Value="\"/>
       <SearchPaths>
-        <IncludeFiles Value="$(LazarusDir)\components\printers\$(TargetOS)\"/>
+        <IncludeFiles Value="$(LazarusDir)/components/printers/$(TargetOS)/"/>
-        <OtherUnitFiles Value="$(LazarusDir)\components\printers\$(TargetOS)\"/>
+        <OtherUnitFiles Value="$(LazarusDir)/components/printers/$(TargetOS)/"/>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
       <CodeGeneration>
         <Generate Value="Faster"/>
@@ -19,6 +17,7 @@
         <CustomOptions Value="-dUseCache
 "/>
         <CompilerPath Value="$(CompPath)"/>
+        <CreateMakefileOnBuild Value="True"/>
       </Other>
     </CompilerOptions>
     <Description Value="Printer implementation for Lazarus
@@ -45,95 +44,95 @@
         <Type Value="Text"/>
       </Item4>
       <Item5>
-        <Filename Value="linux\udlgselectprinter.lfm"/>
+        <Filename Value="linux/udlgselectprinter.lfm"/>
         <Type Value="LFM"/>
       </Item5>
       <Item6>
-        <Filename Value="linux\udlgselectprinter.lrs"/>
+        <Filename Value="linux/udlgselectprinter.lrs"/>
         <Type Value="LRS"/>
       </Item6>
       <Item7>
-        <Filename Value="linux\udlgselectprinter.pp"/>
+        <Filename Value="linux/udlgselectprinter.pp"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="uDlgSelectPrinter"/>
       </Item7>
       <Item8>
-        <Filename Value="linux\cupsdyn.pp"/>
+        <Filename Value="linux/cupsdyn.pp"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="cupsdyn"/>
       </Item8>
       <Item9>
-        <Filename Value="linux\cupsprinters.inc"/>
+        <Filename Value="linux/cupsprinters.inc"/>
         <Type Value="Include"/>
       </Item9>
       <Item10>
-        <Filename Value="linux\cupsprinters_h.inc"/>
+        <Filename Value="linux/cupsprinters_h.inc"/>
         <Type Value="Include"/>
       </Item10>
       <Item11>
-        <Filename Value="linux\jobsimglist.lrs"/>
+        <Filename Value="linux/jobsimglist.lrs"/>
         <Type Value="LRS"/>
       </Item11>
       <Item12>
-        <Filename Value="linux\printerprop.lrs"/>
+        <Filename Value="linux/printerprop.lrs"/>
         <Type Value="LRS"/>
       </Item12>
       <Item13>
-        <Filename Value="linux\selectprinter.lrs"/>
+        <Filename Value="linux/selectprinter.lrs"/>
         <Type Value="LRS"/>
       </Item13>
       <Item14>
-        <Filename Value="linux\udlgprintersjobs.lfm"/>
+        <Filename Value="linux/udlgprintersjobs.lfm"/>
         <Type Value="LFM"/>
       </Item14>
       <Item15>
-        <Filename Value="linux\udlgprintersjobs.lrs"/>
+        <Filename Value="linux/udlgprintersjobs.lrs"/>
         <Type Value="LRS"/>
       </Item15>
       <Item16>
-        <Filename Value="linux\udlgprintersjobs.pp"/>
+        <Filename Value="linux/udlgprintersjobs.pp"/>
         <Type Value="Text"/>
         <UnitName Value="udlgPrintersJobs"/>
       </Item16>
       <Item17>
-        <Filename Value="linux\udlgpropertiesprinter.lfm"/>
+        <Filename Value="linux/udlgpropertiesprinter.lfm"/>
         <Type Value="LFM"/>
       </Item17>
       <Item18>
-        <Filename Value="linux\udlgpropertiesprinter.lrs"/>
+        <Filename Value="linux/udlgpropertiesprinter.lrs"/>
         <Type Value="LRS"/>
       </Item18>
       <Item19>
-        <Filename Value="linux\udlgpropertiesprinter.pp"/>
+        <Filename Value="linux/udlgpropertiesprinter.pp"/>
         <AddToUsesPkgSection Value="False"/>
         <UnitName Value="uDlgPropertiesPrinter"/>
       </Item19>
       <Item20>
-        <Filename Value="linux\udlgselectprinter.lfm"/>
+        <Filename Value="linux/udlgselectprinter.lfm"/>
         <Type Value="LFM"/>
       </Item20>
       <Item21>
-        <Filename Value="linux\udlgselectprinter.lrs"/>
+        <Filename Value="linux/udlgselectprinter.lrs"/>
         <Type Value="LRS"/>
       </Item21>
       <Item22>
-        <Filename Value="win32\winprinters.inc"/>
+        <Filename Value="win32/winprinters.inc"/>
         <Type Value="Include"/>
       </Item22>
       <Item23>
-        <Filename Value="win32\winutilprnconst.inc"/>
+        <Filename Value="win32/winutilprnconst.inc"/>
         <Type Value="Include"/>
       </Item23>
       <Item24>
-        <Filename Value="win32\winprinters_h.inc"/>
+        <Filename Value="win32/winprinters_h.inc"/>
         <Type Value="Include"/>
       </Item24>
       <Item25>
-        <Filename Value="win32\winprndialogs.inc"/>
+        <Filename Value="win32/winprndialogs.inc"/>
         <Type Value="Include"/>
       </Item25>
       <Item26>
-        <Filename Value="linux\cupsprndialogs.inc"/>
+        <Filename Value="linux/cupsprndialogs.inc"/>
         <Type Value="Include"/>
       </Item26>
     </Files>
@@ -148,11 +147,10 @@
       </Item2>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)/"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
-      <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
       <CommandAfter Value="tar czf $MakeFile($(ProjPublishDir)).tgz $(ProjPublishDir)"/>
     </PublishOptions>
   </Package>

docs/BigIDE.txt

@@ -0,0 +1,11 @@
+How to add a package to the big IDE:
+
+Enable the package compiler option 'Create Makefile' and compile the package
+once in the IDE to create the Makefile and Makefile.fpc.
+Add them to svn.
+
+ide/Makefile.fpc          Unitpaths and flags
+components/Makefile.fpc   package directories
+ide/lazarus.pp            package names
+
+Do not forget update the ide/Makefile and components/Makefile.

ide/Makefile

@@ -257,7 +257,10 @@ LAZARUS_OPT=$(LAZARUS_LIBPATHS)
 ifeq ($(OS_TARGET),win32)
 LAZARUS_OPT+= -WG
 endif
-BIG_IDE_OPTIONS=-dBigIDE -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)
+BIG_IDE_OPTIONS=-dBigIDE \
+  -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/printers/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif

ide/Makefile.fpc

@@ -92,8 +92,10 @@ endif
 
 #
 # Options to compile an IDE with a lot of packages
-BIG_IDE_OPTIONS=-dBigIDE -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET)
+BIG_IDE_OPTIONS=-dBigIDE \
-
+  -Fu../components/rtticontrols/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/printers/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET)
 
 #-----------------------------------------------------------------------------
 [rules]

ide/lazarus.pp

@@ -57,7 +57,7 @@ uses
   {$I staticpackages.inc}
   {$ENDIF}
   {$IFDEF BigIDE}
-  RunTimeTypeInfoControls,
+  RunTimeTypeInfoControls, Printer4Lazarus, CGILaz,
   {$ENDIF}
   MainBase;
 

ide/project.pp

@@ -3790,8 +3790,8 @@ begin
   if CodeToolBoss.SetGlobalValue(ExternalMacroStart+'LCLWidgetType',
                                 Owner.CompilerOptions.GetEffectiveLCLWidgetType)
   then begin
-    DebugLn('TProjectDefineTemplates.UpdateGlobalValues '
+    //DebugLn('TProjectDefineTemplates.UpdateGlobalValues '
-    ,' LCLWidgetType="',CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'LCLWidgetType'],'" Effective="',Owner.CompilerOptions.GetEffectiveLCLWidgetType,'" Options="',Owner.CompilerOptions.LCLWidgetType,'"');
+    //,' LCLWidgetType="',CodeToolBoss.GlobalValues.Variables[ExternalMacroStart+'LCLWidgetType'],'" Effective="',Owner.CompilerOptions.GetEffectiveLCLWidgetType,'" Options="',Owner.CompilerOptions.LCLWidgetType,'"');
     Changed:=true;
   end;
   if Owner.IsVirtual then