added to bigide: jpeg, projecttemplates, fpcunit

git-svn-id: trunk@8583 -
2025-04-07 14:38:01 +02:00 · 2006-01-20 23:13:19 +00:00 · 2006-01-20 23:13:19 +00:00 · daa545bd9c
commit daa545bd9c
parent bb03f0730f
18 changed files with 9114 additions and 15 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -106,11 +106,15 @@ components/customform/demo/dbappform.pas svneol=native#text/plain
 components/customform/demo/regappforms.pp svneol=native#text/plain
 components/customform/lazcustforms.lpk svneol=native#text/plain
 components/customform/lazcustforms.pas svneol=native#text/plain
+components/fpcunit/Makefile svneol=native#text/plain
+components/fpcunit/Makefile.fpc svneol=native#text/plain
 components/fpcunit/fpcunittestrunner.lpk svneol=native#text/pascal
 components/fpcunit/fpcunittestrunner.pas svneol=native#text/pascal
 components/fpcunit/guitestrunner.lfm svneol=native#text/plain
 components/fpcunit/guitestrunner.lrs svneol=native#text/pascal
 components/fpcunit/guitestrunner.pas svneol=native#text/pascal
+components/fpcunit/ide/Makefile svneol=native#text/plain
+components/fpcunit/ide/Makefile.fpc svneol=native#text/plain
 components/fpcunit/ide/README.txt svneol=native#text/plain
 components/fpcunit/ide/fpcunitide.lpk svneol=native#text/pascal
 components/fpcunit/ide/fpcunitide.pas svneol=native#text/pascal
@ -145,6 +149,8 @@ components/interbase/tibdatabase.xpm -text svneol=native#image/x-xpixmap
 components/interbase/tibquery.ico -text svneol=unset#image/x-icon
 components/interbase/tibquery.xpm -text svneol=native#image/x-xpixmap
 components/interbase/tibtransaction.xpm -text svneol=native#image/x-xpixmap
+components/jpeg/Makefile svneol=native#text/plain
+components/jpeg/Makefile.fpc svneol=native#text/plain
 components/jpeg/examples/README.txt svneol=native#text/plain
 components/jpeg/examples/jpegexample.lpi svneol=native#text/plain
 components/jpeg/examples/jpegexample.lpr svneol=native#text/pascal
@ -250,6 +256,8 @@ components/printers/win32/winprinters_h.inc svneol=native#text/pascal
 components/printers/win32/winprndialogs.inc svneol=native#text/pascal
 components/printers/win32/winutilprn.pas svneol=native#text/pascal
 components/printers/win32/winutilprnconst.inc svneol=native#text/pascal
+components/projecttemplates/Makefile svneol=native#text/plain
+components/projecttemplates/Makefile.fpc svneol=native#text/plain
 components/projecttemplates/README svneol=native#text/plain
 components/projecttemplates/frmtemplatesettings.lfm svneol=native#text/plain
 components/projecttemplates/frmtemplatesettings.lrs svneol=native#text/plain
--- a/components/Makefile
+++ b/components/Makefile
@ -1775,4 +1775,8 @@ bigidecomponents: all
 	$(MAKE) -C cgi/ide
 	$(MAKE) -C tdbf
 	$(MAKE) -C turbopower_ipro
+	$(MAKE) -C jpeg
+	$(MAKE) -C fpcunit
+	$(MAKE) -C fpcunit/ide
+	$(MAKE) -C projecttemplates
 cleanlaz: clean
--- a/components/Makefile.fpc
+++ b/components/Makefile.fpc
@ -27,5 +27,9 @@ bigidecomponents: all
        $(MAKE) -C cgi/ide
        $(MAKE) -C tdbf
        $(MAKE) -C turbopower_ipro
+        $(MAKE) -C jpeg
+        $(MAKE) -C fpcunit
+        $(MAKE) -C fpcunit/ide
+        $(MAKE) -C projecttemplates

 cleanlaz: clean
--- a/components/fpcunit/Makefile
+++ b/components/fpcunit/Makefile
--- a/components/fpcunit/Makefile.fpc
+++ b/components/fpcunit/Makefile.fpc
@ -0,0 +1,28 @@
+#   Makefile.fpc for FPCUnitTestRunner 0.1
+
+[package]
+name=fpcunittestrunner
+version=0.1
+
+[compiler]
+unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
+unitdir=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
+options=-dLCL -dLCLgtk -S2 -gl
+
+[target]
+units=fpcunittestrunner.pas
+
+[clean]
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+
+[rules]
+.PHONY: cleartarget all
+
+cleartarget:
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/fpcunittestrunner$(PPUEXT)
+
+all: cleartarget $(COMPILER_UNITTARGETDIR) fpcunittestrunner$(PPUEXT)
--- a/components/fpcunit/fpcunittestrunner.lpk
+++ b/components/fpcunit/fpcunittestrunner.lpk
@ -1,20 +1,19 @@
 <?xml version="1.0"?>
 <CONFIG>
  <Package Version="2">
-    <PathDelim Value="\"/>
    <Name Value="FPCUnitTestRunner"/>
    <Author Value="Vincent Snijders"/>
    <CompilerOptions>
-      <Version Value="2"/>
-      <PathDelim Value="\"/>
+      <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="FPCUnit gui test runner form"/>
@ -37,7 +36,7 @@
      </Item2>
    </RequiredPkgs>
    <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)/"/>
    </UsageOptions>
    <PublishOptions>
      <Version Value="2"/>
--- a/components/fpcunit/ide/Makefile
+++ b/components/fpcunit/ide/Makefile
--- a/components/fpcunit/ide/Makefile.fpc
+++ b/components/fpcunit/ide/Makefile.fpc
@ -0,0 +1,28 @@
+#   Makefile.fpc for fpcunitide 0.1
+
+[package]
+name=fpcunitide
+version=0.1
+
+[compiler]
+unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
+unitdir=../../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
+options=-dLCL -dLCLgtk -S2 -gl
+
+[target]
+units=fpcunitide.pas
+
+[clean]
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+
+[rules]
+.PHONY: cleartarget all
+
+cleartarget:
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/fpcunitide$(PPUEXT)
+
+all: cleartarget $(COMPILER_UNITTARGETDIR) fpcunitide$(PPUEXT)
--- a/components/fpcunit/ide/fpcunitide.lpk
+++ b/components/fpcunit/ide/fpcunitide.lpk
@ -1,21 +1,19 @@
 <?xml version="1.0"?>
 <CONFIG>
  <Package Version="2">
-    <PathDelim Value="\"/>
    <Name Value="fpcunitide"/>
    <Author Value="Vincent Snijders"/>
    <CompilerOptions>
-      <Version Value="2"/>
-      <PathDelim Value="\"/>
+      <Version Value="5"/>
      <SearchPaths>
-        <UnitOutputDirectory Value="lib\"/>
-        <SrcPath Value="$(LazarusDir)\ideintf\"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/>
      </SearchPaths>
      <CodeGeneration>
        <Generate Value="Faster"/>
      </CodeGeneration>
      <Other>
        <CompilerPath Value="$(CompPath)"/>
+        <CreateMakefileOnBuild Value="True"/>
      </Other>
    </CompilerOptions>
    <Version Minor="1"/>
@ -36,7 +34,7 @@
      </Item2>
    </RequiredPkgs>
    <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)\"/>
+      <UnitPath Value="$(PkgOutDir)/"/>
    </UsageOptions>
    <PublishOptions>
      <Version Value="2"/>
--- a/components/jpeg/Makefile
+++ b/components/jpeg/Makefile
--- a/components/jpeg/Makefile.fpc
+++ b/components/jpeg/Makefile.fpc
@ -0,0 +1,28 @@
+#   Makefile.fpc for JPEGForLazarus 1.0.1
+
+[package]
+name=jpegforlazarus
+version=1.0.1
+
+[compiler]
+unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
+unitdir=../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
+options=-dLCL -dLCLgtk -S2 -gl
+
+[target]
+units=jpegforlazarus.pas
+
+[clean]
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+
+[rules]
+.PHONY: cleartarget all
+
+cleartarget:
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/jpegforlazarus$(PPUEXT)
+
+all: cleartarget $(COMPILER_UNITTARGETDIR) jpegforlazarus$(PPUEXT)
--- a/components/jpeg/jpegforlazarus.lpk
+++ b/components/jpeg/jpegforlazarus.lpk
@ -13,6 +13,7 @@
      </CodeGeneration>
      <Other>
        <CompilerPath Value="$(CompPath)"/>
+        <CreateMakefileOnBuild Value="True"/>
      </Other>
    </CompilerOptions>
    <Description Value="JPEG for Lazarus.
--- a/components/projecttemplates/Makefile
+++ b/components/projecttemplates/Makefile
--- a/components/projecttemplates/Makefile.fpc
+++ b/components/projecttemplates/Makefile.fpc
@ -0,0 +1,28 @@
+#   Makefile.fpc for ProjTemplates 1.0
+
+[package]
+name=projtemplates
+version=1.0
+
+[compiler]
+unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)
+unitdir=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/
+options=-dLCL -dLCLgtk -S2 -gl
+
+[target]
+units=projtemplates.pas
+
+[clean]
+files=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) \
+      $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) \
+      $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+
+[rules]
+.PHONY: cleartarget all
+
+cleartarget:
+        -$(DEL) $(COMPILER_UNITTARGETDIR)/projtemplates$(PPUEXT)
+
+all: cleartarget $(COMPILER_UNITTARGETDIR) projtemplates$(PPUEXT)
--- a/components/projecttemplates/projtemplates.lpk
+++ b/components/projecttemplates/projtemplates.lpk
@ -6,13 +6,14 @@
    <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="IDE extension to create projects based on project templates
--- a/ide/Makefile
+++ b/ide/Makefile
@ -263,7 +263,11 @@ BIG_IDE_OPTIONS=-dBigIDE \
  -Fu../components/cgi/ide/lib/$(CPU_TARGET)-$(OS_TARGET) \
  -Fu../components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET) \
  -Fu../components/tdbf/lib/$(CPU_TARGET)-$(OS_TARGET) \
-  -Fu../components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)
+  -Fu../components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/jpeg/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/fpcunit/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/fpcunit/ide/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/projecttemplates/lib/$(CPU_TARGET)-$(OS_TARGET)
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_PROGRAMS+=lazarus startlazarus
 endif
--- a/ide/Makefile.fpc
+++ b/ide/Makefile.fpc
@ -98,7 +98,11 @@ BIG_IDE_OPTIONS=-dBigIDE \
  -Fu../components/cgi/ide/lib/$(CPU_TARGET)-$(OS_TARGET) \
  -Fu../components/cgi/lib/$(CPU_TARGET)-$(OS_TARGET) \
  -Fu../components/tdbf/lib/$(CPU_TARGET)-$(OS_TARGET) \
-  -Fu../components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET)
+  -Fu../components/turbopower_ipro/units/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/jpeg/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/fpcunit/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/fpcunit/ide/lib/$(CPU_TARGET)-$(OS_TARGET) \
+  -Fu../components/projecttemplates/lib/$(CPU_TARGET)-$(OS_TARGET)

 #-----------------------------------------------------------------------------
 [rules]
--- a/ide/lazarus.pp
+++ b/ide/lazarus.pp
@ -58,7 +58,7 @@ uses
  {$ENDIF}
  {$IFDEF BigIDE}
  RunTimeTypeInfoControls, Printer4Lazarus, CGILaz, CGILazIDE, DBFLaz,
-  TurboPowerIPro,
+  TurboPowerIPro, LazJPEG, FPCUnitTestRunner, FPCUnitIDE, ProjTemplates,
  {$ENDIF}
  MainBase;