From: znek Date: Sun, 19 Dec 2004 14:59:28 +0000 (+0000) Subject: fixed encoding issues X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8091063ec188a9b919253fc73e5bfbed04c8ef5;p=sope fixed encoding issues git-svn-id: http://svn.opengroupware.org/SOPE/trunk@452 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sopex/Templates/ChangeLog b/sopex/Templates/ChangeLog index 873bd655..f21b15de 100644 --- a/sopex/Templates/ChangeLog +++ b/sopex/Templates/ChangeLog @@ -1,3 +1,8 @@ +2004-12-19 Marcus Mueller + + * Project Templates/SOPE/Web Application/*: fixed various replacement + and encoding related issues with project template + 2004-12-14 Marcus Mueller * Project Templates/SOPE/Web Application/*: updated for SOPE:X 2.x. diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile index b6aae045..7d370160 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile +++ b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile @@ -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 diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble index 7aab0b0c..01063c9d 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble +++ b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble @@ -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 diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble index e7517139..07720cdf 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble +++ b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble @@ -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 diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Main.m b/sopex/Templates/Project Templates/SOPE/Web Application/Main.m index 60e47272..1b87e6c0 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/Main.m +++ b/sopex/Templates/Project Templates/SOPE/Web Application/Main.m @@ -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 - @interface Main : WOComponent { @@ -31,6 +14,7 @@ @end +#include "common.h" @implementation Main diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Main.wox b/sopex/Templates/Project Templates/SOPE/Web Application/Main.wox index 48ca0086..570743fb 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/Main.wox +++ b/sopex/Templates/Project Templates/SOPE/Web Application/Main.wox @@ -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" > <var:string value="name"/> diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Version b/sopex/Templates/Project Templates/SOPE/Web Application/Version index 9b97c7dd..e357c5d3 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/Version +++ b/sopex/Templates/Project Templates/SOPE/Web Application/Version @@ -12,4 +12,3 @@ MAJOR_VERSION=1 MINOR_VERSION=0 SUBMINOR_VERSION=0 - diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/TemplateInfo.plist b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/TemplateInfo.plist index e0a34c0a..041e430e 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/TemplateInfo.plist +++ b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/TemplateInfo.plist @@ -4,7 +4,7 @@ "WebApp_main.m" = "«PROJECTNAME»_main.m"; }; FilesToMacroExpand = ( - "«PROJECTNAME»_Prefix.pch", + "common.h", "«PROJECTNAME»_main.m", "Application.h", "Application.m", @@ -12,10 +12,18 @@ "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."; } diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj index cb5c6932..0e6a23b6 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj +++ b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj @@ -12,6 +12,8 @@ AD19ED6405D7FBEA009EBA3A, ADEE3DD605DD126900F523DB, ); + fileEncoding = 5; + indentWidth = 2; isa = PBXGroup; name = Classes; refType = 4; @@ -116,7 +118,8 @@ sourceTree = ""; }; 29B97316FDCFA39411CA2CEA = { - fileEncoding = 30; + fileEncoding = 5; + indentWidth = 2; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "«PROJECTNAME»_main.m"; @@ -347,6 +350,7 @@ AD0ACCE1062733370054A820, AD0ACCE0062733370054A820, ); + fileEncoding = 5; isa = PBXGroup; name = Makefiles; refType = 4; @@ -354,7 +358,7 @@ }; AD0ACCDF062733370054A820 = { explicitFileType = sourcecode.make; - fileEncoding = 4; + fileEncoding = 5; indentWidth = 8; isa = PBXFileReference; path = GNUmakefile; @@ -364,7 +368,7 @@ }; AD0ACCE0062733370054A820 = { explicitFileType = sourcecode.make; - fileEncoding = 4; + fileEncoding = 5; indentWidth = 8; isa = PBXFileReference; path = GNUmakefile.postamble; @@ -374,7 +378,7 @@ }; AD0ACCE1062733370054A820 = { explicitFileType = sourcecode.make; - fileEncoding = 4; + fileEncoding = 5; indentWidth = 8; isa = PBXFileReference; path = GNUmakefile.preamble; @@ -392,7 +396,7 @@ sourceTree = ""; }; AD19ED5205D7FBD1009EBA3A = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Application.h; @@ -400,7 +404,7 @@ sourceTree = ""; }; AD19ED5305D7FBD1009EBA3A = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Application.m; @@ -420,7 +424,7 @@ }; }; AD19ED6305D7FBEA009EBA3A = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Session.h; @@ -428,7 +432,7 @@ sourceTree = ""; }; AD19ED6405D7FBEA009EBA3A = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Session.m; @@ -580,7 +584,7 @@ sourceTree = ""; }; ADAD4710076F441600AAD24E = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Main.m; @@ -600,7 +604,7 @@ }; }; ADAD4713076F443B00AAD24E = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.h; @@ -619,6 +623,8 @@ AD19ED6305D7FBEA009EBA3A, ADEE3DD505DD126900F523DB, ); + fileEncoding = 5; + indentWidth = 2; isa = PBXGroup; name = Headers; path = ""; @@ -1051,7 +1057,7 @@ }; }; ADEE3DD505DD126900F523DB = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DirectAction.h; @@ -1059,7 +1065,7 @@ sourceTree = ""; }; ADEE3DD605DD126900F523DB = { - fileEncoding = 4; + fileEncoding = 5; isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DirectAction.m; diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m index ed096f7b..c5335da5 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m +++ b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m @@ -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 #endif /* WITHOUT_SOPEX */ - int main(int argc, const char *argv[]) { return SOPEXMain(@"Application", argc, argv); } diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/common.h b/sopex/Templates/Project Templates/SOPE/Web Application/common.h index cd70c714..85352152 100644 --- a/sopex/Templates/Project Templates/SOPE/Web Application/common.h +++ b/sopex/Templates/Project Templates/SOPE/Web Application/common.h @@ -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 #include #include -#endif /* __«PROJECTNAME»_common_H_ */ +#endif /* __ÇPROJECTNAMEÈ_common_H_ */