* zipname creation from packagename

utils/fpcmake.ini

@@ -58,6 +58,25 @@ else
 SEARCHPATH=$(subst ;, ,$(PATH))
 endif
 
+# echo
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+
+# Base dir
+ifdef PWD
+BASEDIR:=$(shell $(PWD))
+else
+BASEDIR=.
+endif
+
+
 [defaulttarget]
 #####################################################################
 # Default target
@@ -146,14 +165,14 @@ endif
 ifeq ($(wildcard $(UNITSDIR)),)
 UNITSDIR=
 endif
-ifeq ($(wildcard $(TOOLKITDIR)),)
-TOOLKITDIR=
+ifeq ($(wildcard $(TOOLKITSDIR)),)
+TOOLKITSDIR=
 endif
-ifeq ($(wildcard $(PACKAGEDIR)),)
-PACKAGEDIR=
+ifeq ($(wildcard $(PACKAGESDIR)),)
+PACKAGESDIR=
 endif
-ifeq ($(wildcard $(COMPONENTDIR)),)
-COMPONENTDIR=
+ifeq ($(wildcard $(COMPONENTSDIR)),)
+COMPONENTSDIR=
 endif
 
 
@@ -178,13 +197,6 @@ endif
 # Default Directories
 #####################################################################
 
-# Base dir
-ifdef PWD
-BASEDIR:=$(shell $(PWD))
-else
-BASEDIR=.
-endif
-
 # set the prefix directory where to install everything
 ifndef PREFIXINSTALLDIR
 ifdef inlinux
@@ -424,11 +436,10 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 endif
 
-# For win32 the options are passed using the environment variable FPCEXTCMD
+# For win32 the options are passed using the file fpcext.cmd
 ifeq ($(OS_SOURCE),win32)
-override FPCEXTCMD:=$(FPCOPT)
-override FPCOPT:=!FPCEXTCMD
-export FPCEXTCMD
+override TMPVAR:=$(shell "$(ECHO) -e $(addprefix "\n",$(FPCOPT)) > fpcext.cmd")
+override FPCOPT:[email protected]
 endif
 
 # Compiler commandline
@@ -535,17 +546,6 @@ else
 LDCONFIG=
 endif
 
-# echo
-ifndef ECHO
-ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))
-ifeq ($(ECHO),)
-ECHO:=echo
-else
-ECHO:=$(firstword $(ECHO))
-endif
-endif
-export ECHO
-
 [tool_ppdep]
 # ppdep
 ifndef PPDEP
@@ -743,7 +743,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-PACKAGESUFFIX=win32
+PACKAGESUFFIX=w32
 FPCMADE=fpcmade.w32
 endif
 
@@ -1049,6 +1049,13 @@ ifndef DESTZIPDIR
 DESTZIPDIR:=$(BASEDIR)
 endif
 
+# Maybe create default zipname from packagename
+ifndef ZIPNAME
+ifdef PACKAGENAME
+ZIPNAME=$(PACKAGENAME)$(PACKAGESUFFIX)
+endif
+endif
+
 # Add .zip/.tar.gz extension
 ifdef ZIPNAME
 ifndef inlinux
@@ -1250,6 +1257,9 @@ fpc_infoinstall:
         @$(ECHO)
 ifdef DATE
         @$(ECHO)  DateStr.............. $(DATESTR)
+endif
+ifdef PACKAGENAME
+        @$(ECHO)  PackageName.......... $(PACKAGENAME)
 endif
         @$(ECHO)  PackageSuffix........ $(PACKAGESUFFIX)
         @$(ECHO)
@@ -1261,6 +1271,9 @@ endif
         @$(ECHO)  DocInstallDir........ $(DOCINSTALLDIR)
         @$(ECHO)  DataInstallDir....... $(DATAINSTALLDIR)
         @$(ECHO)
+        @$(ECHO)  DestZipDir........... $(DESTZIPDIR)
+        @$(ECHO)  ZipName.............. $(ZIPNAME)
+        @$(ECHO)
 
 [localmakefile]
 #####################################################################

utils/fpcmake.pp

@@ -131,6 +131,7 @@ type
     TargetPrograms,
     TargetExamples,
     TargetRST      : TTargetsString;
+    InstallPackageName,
     InstallUnitSubDir,
     InstallPrefixDir,
     InstallDataDir,
@@ -312,6 +313,7 @@ begin
      ReadTargetsString(CleanUnits,ini_clean,'units','');
      ReadTargetsString(CleanFiles,ini_clean,'files','');
    { install }
+     InstallPackageName:=ReadString(ini_install,'packagename','');
      InstallPrefixDir:=ReadString(ini_install,'dirprefix','');
      InstallBaseDir:=ReadString(ini_install,'basedir','');
      InstallDataDir:=ReadString(ini_install,'datadir','');
@@ -810,14 +812,14 @@ begin
      AddSection(true,'fpcdirdetect');
 
    { fpcdir subdirs }
-     Add('ifndef PACKAGEDIR');
-     Add('PACKAGEDIR='+userini.dirpackage);
+     Add('ifndef PACKAGESDIR');
+     Add('PACKAGESDIR='+userini.dirpackage);
      Add('endif');
-     Add('ifndef TOOLKITDIR');
-     Add('TOOLKITDIR='+userini.dirtoolkit);
+     Add('ifndef TOOLKITSDIR');
+     Add('TOOLKITSDIR='+userini.dirtoolkit);
      Add('endif');
-     Add('ifndef COMPONENTDIR');
-     Add('COMPONENTDIR='+userini.dircomponent);
+     Add('ifndef COMPONENTSDIR');
+     Add('COMPONENTSDIR='+userini.dircomponent);
      Add('endif');
      AddSection(userini.requirertl,'fpcdirsubs');
 
@@ -850,6 +852,8 @@ begin
       Add('DATAINSTALLDIR='+userini.installdatadir);
      if userini.InstallUnitSubDir<>'' then
       Add('UNITSUBDIR='+userini.InstallUnitSubDir);
+     if userini.installpackagename<>'' then
+      Add('PACKAGENAME='+userini.installpackagename);
 
    { Zip }
      if userini.zipname<>'' then
@@ -934,9 +938,9 @@ begin
    { package/component dirs }
      AddHead('Package/component dirs');
      AddSection(userini.requirertl,'checkfpcdirsubs');
-     AddTargetsUnitDir('$(TOOLKITDIR)',userini.Requiretoolkits);
-     AddTargetsUnitDir('$(PACKAGEDIR)',userini.Requirepackages);
-     AddTargetsUnitDir('$(COMPONENTDIR)',userini.Requirecomponents);
+     AddTargetsUnitDir('$(TOOLKITSDIR)',userini.Requiretoolkits);
+     AddTargetsUnitDir('$(PACKAGESDIR)',userini.Requirepackages);
+     AddTargetsUnitDir('$(COMPONENTSDIR)',userini.Requirecomponents);
      Add('');
 
    { write dirs }
@@ -1129,7 +1133,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.21  2000-01-08 16:31:04  peter
+  Revision 1.22  2000-01-10 22:55:49  peter
+    * zipname creation from packagename
+
+  Revision 1.21  2000/01/08 16:31:04  peter
     * support variable in packagenames
     * fpcmake.loc support
     * fixed place of presettings which must be before FPCDIR is set