]> err.no Git - sope/commitdiff
fixed encoding issues
authorznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Sun, 19 Dec 2004 14:59:28 +0000 (14:59 +0000)
committerznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Sun, 19 Dec 2004 14:59:28 +0000 (14:59 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@452 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

sopex/Templates/ChangeLog
sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile
sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble
sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble
sopex/Templates/Project Templates/SOPE/Web Application/Main.m
sopex/Templates/Project Templates/SOPE/Web Application/Main.wox
sopex/Templates/Project Templates/SOPE/Web Application/Version
sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/TemplateInfo.plist
sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj
sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m
sopex/Templates/Project Templates/SOPE/Web Application/common.h

index 873bd6555e0d3949bd83bd070d30aa0c94113985..f21b15de20a555a2e8523ec3572b5f76915b54ec 100644 (file)
@@ -1,3 +1,8 @@
+2004-12-19  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * Project Templates/SOPE/Web Application/*: fixed various replacement
+         and encoding related issues with project template
+        
 2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * Project Templates/SOPE/Web Application/*: updated for SOPE:X 2.x.
index b6aae045321217369f7e4cf1c4cb819af70f729e..7d370160315b6d4334045540ab79ac65d94e3902 100644 (file)
@@ -1,24 +1,23 @@
 #
-#  GNUmakefile
-#  «PROJECTNAME»
+# GNUmakefile
+# ÇPROJECTNAMEÈ
 #
-#  Created by «FULLUSERNAME» on «DATE».
-#  Copyright (c) «YEAR» «ORGANIZATIONNAME». All rights reserved.
+# Created by ÇUSERNAMEÈ on ÇDATEÈ
 #
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
-WOAPP_NAME = «PROJECTNAME»
+WOAPP_NAME = ÇPROJECTNAMEÈ
 
-«PROJECTNAME»_OBJC_FILES = \
-«PROJECTNAME»_main.m Application.m   Session.m       DirectAction.m  \
+ÇPROJECTNAMEÈ_OBJC_FILES = \
+ÇPROJECTNAMEÈ_main.m   Application.m   Session.m       DirectAction.m  \
 Main.m
 
-«PROJECTNAME»_COMPONENTS = \
+ÇPROJECTNAMEÈ_COMPONENTS = \
 
-«PROJECTNAME»_RESOURCE_FILES = \
+ÇPROJECTNAMEÈ_RESOURCE_FILES = \
 
-«PROJECTNAME»_WEBSERVER_RESOURCE_FILES := $(shell find WebServerResources -type f -print)
+ÇPROJECTNAMEÈ_WEBSERVER_RESOURCE_FILES := $(shell find WebServerResources -type f -print)
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/woapp.make
index 7aab0b0c18960905e9b378b8f117bd63212be113..01063c9da5d03d5db3f3f3d5cee4559978046f88 100644 (file)
@@ -1,9 +1,8 @@
 #
-#  GNUmakefile.postamble
-#  «PROJECTNAME»
+# GNUmakefile.postamble
+# ÇPROJECTNAMEÈ
 #
-#  Created by «FULLUSERNAME» on «DATE».
-#  Copyright (c) «YEAR» «ORGANIZATIONNAME». All rights reserved.
+# Created by ÇUSERNAMEÈ on ÇDATEÈ
 #
 
 -include GNUmakefile.postamble.local
index e75171395af39c8d49d36dfde4effef262dfa166..07720cdf421c1f8258f7791bf94a951e507cf180 100644 (file)
@@ -1,9 +1,8 @@
 #
-#  GNUmakefile.preamble
-#  «PROJECTNAME»
+# GNUmakefile.preamble
+# ÇPROJECTNAMEÈ
 #
-#  Created by «FULLUSERNAME» on «DATE».
-#  Copyright (c) «YEAR» «ORGANIZATIONNAME». All rights reserved.
+# Created by ÇUSERNAMEÈ on ÇDATEÈ
 #
 
 -include GNUmakefile.preamble.local
index 60e472721831dddae55537524524415c1e048a29..1b87e6c0281839f7d210d652b433706870d62abc 100644 (file)
@@ -1,29 +1,12 @@
-/*
-  Copyright (C) 2000-2004 SKYRIX Software AG
-
-  This file is part of OGo
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: wox.m 25 2004-07-30 11:22:02Z znek $
-
+//
+// Main.m
+// Project ÇPROJECTNAMEÈ
+//
+// Created by ÇUSERNAMEÈ on ÇDATEÈ
+//
 
 #include <NGObjWeb/NGObjWeb.h>
 
-
 @interface Main : WOComponent
 {
 
@@ -31,6 +14,7 @@
 
 @end
 
+#include "common.h"
 
 @implementation Main
 
index 48ca008656942e58132bfdc78e1aecb4a4699fd3..570743fb6d2f27c8aa6d898b192cc0f0aefcd0e2 100644 (file)
@@ -4,6 +4,7 @@
       xmlns:var="http://www.skyrix.com/od/binding"
       xmlns:const="http://www.skyrix.com/od/constant"
       xmlns:rsrc="OGo:url"
+      xmlns:label="OGo:label"
 >
   <head>
     <title><var:string value="name"/></title>
index 9b97c7ddac301f38032233f4ceb1cf85f2f43b41..e357c5d30bf1bf0505cacb3bf700c6ef03488c9a 100644 (file)
@@ -12,4 +12,3 @@
 MAJOR_VERSION=1
 MINOR_VERSION=0
 SUBMINOR_VERSION=0
-
index e0a34c0ace04a8c320b8536c59e8eef1273546d7..041e430e02771f13050a75daa832a0b877c797ca 100644 (file)
@@ -4,7 +4,7 @@
                "WebApp_main.m" = "«PROJECTNAME»_main.m";
        };
        FilesToMacroExpand = (
-               "«PROJECTNAME»_Prefix.pch",
+               "common.h",
                "«PROJECTNAME»_main.m",
                "Application.h",
                "Application.m",
                "Session.m",
                "DirectAction.h",
                "DirectAction.m",
-               "Main.h",
                "Main.m",
                "Info.plist",
-               "English.lproj/InfoPlist.strings"
+               "English.lproj/InfoPlist.strings",
+               "GNUmakefile",
+               "GNUmakefile.preamble",
+               "GNUmakefile.postamble",
+               "README",
+               "COPYING",
+               "COPYRIGHT",
+               "NOTES",
+               "PROJECTLEAD",
+               "TODO"
        );
        Description = "This project builds a SOPE application written in Objective-C.";
 }
index cb5c693247a20cdb55c14857fbf55f04830aff9b..0e6a23b6db8d40190dfa2b5b3608400bc03386f1 100644 (file)
@@ -12,6 +12,8 @@
                                AD19ED6405D7FBEA009EBA3A,
                                ADEE3DD605DD126900F523DB,
                        );
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXGroup;
                        name = Classes;
                        refType = 4;
                        sourceTree = "<group>";
                };
                29B97316FDCFA39411CA2CEA = {
-                       fileEncoding = 30;
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = "«PROJECTNAME»_main.m";
                                AD0ACCE1062733370054A820,
                                AD0ACCE0062733370054A820,
                        );
+                       fileEncoding = 5;
                        isa = PBXGroup;
                        name = Makefiles;
                        refType = 4;
                };
                AD0ACCDF062733370054A820 = {
                        explicitFileType = sourcecode.make;
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile;
                };
                AD0ACCE0062733370054A820 = {
                        explicitFileType = sourcecode.make;
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.postamble;
                };
                AD0ACCE1062733370054A820 = {
                        explicitFileType = sourcecode.make;
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.preamble;
                        sourceTree = "<group>";
                };
                AD19ED5205D7FBD1009EBA3A = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = Application.h;
                        sourceTree = "<group>";
                };
                AD19ED5305D7FBD1009EBA3A = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = Application.m;
                        };
                };
                AD19ED6305D7FBEA009EBA3A = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = Session.h;
                        sourceTree = "<group>";
                };
                AD19ED6405D7FBEA009EBA3A = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = Session.m;
                        sourceTree = "<group>";
                };
                ADAD4710076F441600AAD24E = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = Main.m;
                        };
                };
                ADAD4713076F443B00AAD24E = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = common.h;
                                AD19ED6305D7FBEA009EBA3A,
                                ADEE3DD505DD126900F523DB,
                        );
+                       fileEncoding = 5;
+                       indentWidth = 2;
                        isa = PBXGroup;
                        name = Headers;
                        path = "";
                        };
                };
                ADEE3DD505DD126900F523DB = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.h;
                        path = DirectAction.h;
                        sourceTree = "<group>";
                };
                ADEE3DD605DD126900F523DB = {
-                       fileEncoding = 4;
+                       fileEncoding = 5;
                        isa = PBXFileReference;
                        lastKnownFileType = sourcecode.c.objc;
                        path = DirectAction.m;
index ed096f7b3fcc49e772528baac2af3ddddac80d0f..c5335da50c6bbb34d9fd4038a22bf94c9d1a5a24 100644 (file)
@@ -1,9 +1,8 @@
 //
-//  ÇPROJECTNAMEÈ_main.m
-//  ÇPROJECTNAMEÈ
+// ÇPROJECTNAMEÈ_main.m
+// ÇPROJECTNAMEÈ
 //
-//  Created by ÇFULLUSERNAMEÈ on ÇDATEÈ.
-//  Copyright (c) ÇYEARÈ ÇORGANIZATIONNAMEÈ. All rights reserved.
+// Created by ÇUSERNAMEÈ on ÇDATEÈ
 //
 
 #ifdef WITHOUT_SOPEX
@@ -13,7 +12,6 @@
 #include <SOPEX/SOPEX.h>
 #endif /* WITHOUT_SOPEX */
 
-
 int main(int argc, const char *argv[]) {
     return SOPEXMain(@"Application", argc, argv);
 }
index cd70c714b4224ef3654e97d447761acab14a7570..853521527a9ba932a1ea60238818ad609ffe93d1 100644 (file)
@@ -1,15 +1,15 @@
 //
 // common.h
-// Project «PROJECTNAME»
+// Project ÇPROJECTNAMEÈ
 //
-// Created by «USERNAME» on «DATE»
+// Created by ÇUSERNAMEÈ on ÇDATEÈ
 //
 
-#ifndef        __«PROJECTNAME»_common_H_
-#define        __«PROJECTNAME»_common_H_
+#ifndef        __ÇPROJECTNAMEÈ_common_H_
+#define        __ÇPROJECTNAMEÈ_common_H_
 
 #import <Foundation/Foundation.h>
 #include <NGExtensions/NGExtensions.h>
 #include <NGObjWeb/NGObjWeb.h>
 
-#endif /* __«PROJECTNAME»_common_H_ */
+#endif /* __ÇPROJECTNAMEÈ_common_H_ */