Changeset 291


Ignore:
Timestamp:
Apr 1, 2007, 3:50:54 PM (18 years ago)
Author:
cinc
Message:

Migrated to new IDL compiler. Metaclasses are still missing.

Location:
trunk/desktop
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/desktop/Makefile

    r258 r291  
    2929CLASSDLLLIBS    =       -l$(OBJDIR)/nobjtk -l$(OBJDIR)/voyguitk -l$(OBJDIR)/voyfcls
    3030GCLIB           =       -l$(OBJDIR)/gc
     31
     32
     33# NOM IDL compiler
     34NOMIDLINC       =       -I$(FOUNDATIONPATH)/idl -I$(TKIDLDIR) \
     35                        -I$(GUITKPATH)/idl
     36NOMIDLCOMPILER  =       $(BINDIR)/nom-idl-compiler.exe
     37
    3138
    3239# Define objects to build
    … …  
    104111###################################
    105112
    106 BASE_NOMCOMPILEH        =       $(IDLCOMP) $(IDLINC) --showcpperrors --header --output-dir=$(CLASSINC) $<
    107 BASE_NOMCOMPILEIH       =       $(IDLCOMP) $(IDLINC) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
     113
     114#BASE_NOMCOMPILEH       =       $(IDLCOMP) $(IDLINC) --showcpperrors --header --output-dir=$(CLASSINC) $<
     115BASE_NOMCOMPILEH        =       gcc -E -x c -D__NOM_IDL_COMPILER__ $(NOMIDLINC) $< | $(NOMIDLCOMPILER) --emit-h -d $(CLASSINC) -
     116
     117
     118
     119#BASE_NOMCOMPILEIH      =       $(IDLCOMP) $(IDLINC) --showcpperrors --ihfile --output-dir=$(CLASSINC) $<
     120BASE_NOMCOMPILEIH       =       gcc -E -x c -D__NOM_IDL_COMPILER__ $(NOMIDLINC) $< | $(NOMIDLCOMPILER) --emit-ih -d $(CLASSINC) -
     121
    108122BASE_NOMCOMPILEC        =       $(IDLCOMP) $(IDLINC) --showcpperrors --c-template --output-dir=$(CLASSTEMPLATEDIR) $<
    109123

  • trunk/desktop/class_c/wpdatafile.c

    r206 r291  
    5858#include "wpnotebook.h"
    5959#include "wpfolder.h"
     60#include "m_wpdatafile.h"
    6061#include "wpdatafile.ih"
    6162

  • trunk/desktop/class_c/wpdrives.c

    r258 r291  
    2323#include "wpnotebook.h"
    2424#include "wpfolderwindow.h"
     25#include "wpfolder.h"
    2526
     27#include "m_wpdrives.ih"
    2628#include "wpdrives.ih"
    2729

  • trunk/desktop/class_c/wpfilesystem.c

    r244 r291  
    5555#include "wpnotebook.h"
    5656#include "wpfolder.h"
     57#include "m_wpfilesystem.h"
    5758#include "wpfilesystem.ih"
    5859
    … …  
    9394  /* We are a folder somwhere in the chain */
    9495  nomRetval=WPFileSystem_wpQueryFileName((WPFileSystem*)wpParent, bFullPath, NULLHANDLE);
     96
    9597  nomPath=NOMPathNew();
    9698  nomPath= (PNOMPath) NOMPath_assignCString(nomPath, _pszFullPath, ev);

  • trunk/desktop/class_c/wpobject.c

    r248 r291  
    5656#include "wpnotebook.h"
    5757#include "wpfolderwindow.h"
     58#include "m_wpfolder.h"
    5859#include "wpfolder.h"
    5960#include "wpobject.ih"

  • trunk/desktop/class_c/wprootfolder.c

    r258 r291  
    2323#include "wpnotebook.h"
    2424#include "wpfolderwindow.h"
     25#include "wpfolder.h"
     26#include "m_wprootfolder.h"
    2527#include "wprootfolder.ih"
    2628

  • trunk/desktop/idl/wpdatafile.idl

    r245 r291  
    4949interface WPDataFile : WPFileSystem
    5050{
     51#ifdef __NOM_IDL_COMPILER__
     52  metaclass=M_WPDataFile;
     53  filestem=wpdatafile;
     54#endif
    5155  NOMCLASSVERSION(1, 0);
    5256  /**

  • trunk/desktop/idl/wpdrives.idl

    r258 r291  
    5353interface WPDrives : WPFolder
    5454{
     55#ifdef __NOM_IDL_COMPILER__
     56  metaclass=M_WPDrives;
     57  filestem=wpdrives;
     58#endif
    5559  NOMCLASSVERSION(1, 0);
    5660

  • trunk/desktop/idl/wpfilesystem.idl

    r245 r291  
    5555interface WPFileSystem : WPObject
    5656{
     57#ifdef __NOM_IDL_COMPILER__
     58  metaclass=M_WPFileSystem;
     59  filestem=wpfilesystem;
     60#endif
    5761  NOMCLASSVERSION(1, 0);
    5862

  • trunk/desktop/idl/wpfolder.idl

    r258 r291  
    5353interface WPFolder : WPFileSystem
    5454{
     55#ifdef __NOM_IDL_COMPILER__
     56  metaclass=M_WPFolder;
     57  filestem=wpfolder;
     58#endif
    5559  NOMCLASSVERSION(1, 0);
    5660

  • trunk/desktop/idl/wpfolderwindow.idl

    r246 r291  
    4040#define WPFLDRWINDOW_IDL_INCLUDED
    4141
     42#ifdef __NOM_IDL_COMPILER__
     43interface WPObject;
     44#else
     45
    4246/* FIXME: this is an ugly hack to prevent inclusion of the
    4347   wpnotebook.idl file in wpobject.idl which is included
    … …  
    4852#define WPNOTEBOOK_IDL_INCLUDED
    4953native PWPNoteBook;
     54#endif
    5055#endif
    5156
    … …  
    7984interface WPFolderWindow : WPWindow
    8085{
     86#ifdef __NOM_IDL_COMPILER__
     87  filestem=wpfolderwindow;
     88#endif
    8189  NOMCLASSVERSION(1, 0);
    8290

  • trunk/desktop/idl/wpnotebook.idl

    r248 r291  
    3838#define WPNOTEBOOK_IDL_INCLUDED
    3939
    40 #if 0
    41 #ifndef WPObject_defined
    42 #define WPObject_defined
    43 native PWPObject;
    44 #endif
    45 #endif
    46 
    4740#include <nomobj.idl>
    4841
    … …  
    6053interface WPNoteBook : WPWindow
    6154{
     55#ifdef __NOM_IDL_COMPILER__
     56  filestem=wpnotebook;
     57#endif
    6258  NOMCLASSVERSION(1, 0);
    6359

  • trunk/desktop/idl/wpobject.idl

    r248 r291  
    4949#include "nomwindow.idl"
    5050
     51#ifdef __NOM_IDL_COMPILER__
     52interface WPFolderWindow;
     53#else
    5154#ifndef WPFLDRWINDOW_IDL_INCLUDED
    5255native PWPFolderWindow;
    5356#endif
    54 
     57#endif
     58
     59#ifdef __NOM_IDL_COMPILER__
     60interface WPFolder;
     61#else
    5562#ifndef WPFOLDER_IDL_INCLUDED
    5663native PWPFolder;
    5764#endif
    58 
     65#endif
     66
     67#ifdef __NOM_IDL_COMPILER__
     68interface WPNoteBook;
     69#else
    5970#if 1
    6071#ifndef WPNOTEBOOK_IDL_INCLUDED
    … …  
    6374#else
    6475#include "wpnotebook.idl"
     76#endif
    6577#endif
    6678
    … …  
    7385interface WPObject : NOMObject
    7486{
     87#ifdef __NOM_IDL_COMPILER__
     88  metaclass=M_WPObject;
     89  filestem=wpobject;
     90#endif
    7591  NOMCLASSVERSION(1, 0);
    7692

  • trunk/desktop/idl/wprootfolder.idl

    r258 r291  
    5555interface WPRootFolder : WPFolder
    5656{
     57#ifdef __NOM_IDL_COMPILER__
     58  metaclass=M_WPRootFolder;
     59  filestem=wprootfolder;
     60#endif
    5761  NOMCLASSVERSION(1, 0);
    5862

  • trunk/desktop/idl/wpwindow.idl

    r247 r291  
    1616* The Initial Developer of the Original Code is
    1717* netlabs.org: Chris Wohlgemuth <cinc-ml@netlabs.org>.
    18 * Portions created by the Initial Developer are Copyright (C) 2005-2006
     18* Portions created by the Initial Developer are Copyright (C) 2005-2007
    1919* the Initial Developer. All Rights Reserved.
    2020*
    … …  
    3939#define WPWINDOW_IDL_INCLUDED
    4040
    41 #if 0
    42 #ifndef WPObject_defined
    43 #define WPObject_defined
    44 native PWPObject;
    45 #endif
    46 #endif
    47 
    4841#include <nomobj.idl>
    4942#include "nomwindow.idl"
    … …  
    5245NOMCLASSNAME(WPWindow);
    5346
     47#ifdef __NOM_IDL_COMPILER__
     48interface WPObject;
     49#else
    5450#if 1
    5551#ifndef WPOBJECT_IDL_INCLUDED
    … …  
    5854#else
    5955#include "wpobject.idl"
     56#endif
    6057#endif
    6158
    … …  
    6764interface WPWindow : NOMWindow
    6865{
     66#ifdef __NOM_IDL_COMPILER__
     67  filestem=wpwindow;
     68#endif
    6969  NOMCLASSVERSION(1, 0);
    7070

  • trunk/desktop/src/vdesktop.c

    r258 r291  
    150150  /* Init NOM */
    151151  NOMClassMgrObject=nomEnvironmentNew();
    152   //dbgPrintf( "NOMClassMgrObject: %x", NOMClassMgrObject);
    153152
    154153  /* Desktop directory oath */
    … …  
    193192      nomPath=NOMPath_erasePathBegin(nomPath, NULLHANDLE);
    194193      //WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE);
    195       //g_message("   path: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE),
     194      g_message("   path: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, FALSE, NULLHANDLE),
     195                                                    NULLHANDLE));
     196      //      g_message("   path: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpFolder, TRUE, NULLHANDLE),
    196197      //                                            NULLHANDLE));
    197198    };
    198 
     199  g_message("   --> Desktop dir:");
     200  if(nomIsObj(wpTempFolder))
     201    g_message("Valid");
     202
     203  WPFolder_wpQueryFileName(wpTempFolder, TRUE, NULLHANDLE);
     204
     205  //  g_message("   --> Desktop dir: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpTempFolder, FALSE, NULLHANDLE),
     206  //                                                       NULLHANDLE));
     207
     208  g_message("   --> blabla");
    199209  g_message("   --> Desktop dir: %s", NOMPath_queryCString(WPFolder_wpQueryFileName(wpTempFolder, TRUE, NULLHANDLE),
    200                                                             NULLHANDLE));
     210                                                           NULLHANDLE));
    201211
    202212  /* Create desktop folder */
Note: See TracChangeset for help on using the changeset viewer.