]>
Commit | Line | Data |
---|---|---|
4b9a3c3f ER |
1 | --- gcfilms/bin/gcfilms 2005-06-26 17:28:53.000000000 +0200 |
2 | +++ bin/gcfilms 2005-08-08 00:33:40.000000000 +0200 | |
3 | @@ -26,35 +26,28 @@ | |
4 | use utf8; | |
5 | ||
6 | use File::Path; | |
7 | -use FindBin qw($RealBin); | |
8 | use POSIX qw(locale_h); | |
9 | ||
10 | -use lib "$RealBin/../lib/gcfilms"; | |
11 | +use lib qw(/usr/share/gcfilms/lib); | |
12 | ||
13 | #XDG stuff | |
14 | my $home = $ENV{'HOME'}; | |
15 | -$home =~ s/\\/\//g if ($^O =~ /win32/i); | |
16 | ||
17 | -$ENV{XDG_CONFIG_HOME} = $RealBin.'/../config' if ($^O =~ /win32/i); | |
18 | $ENV{XDG_CONFIG_HOME} = $home.'/.config' if ! exists $ENV{XDG_CONFIG_HOME}; | |
19 | mkpath $ENV{XDG_CONFIG_HOME}; | |
20 | ||
21 | -$ENV{XDG_DATA_HOME} = $RealBin.'/../data' if ($^O =~ /win32/i); | |
22 | $ENV{XDG_DATA_HOME} = $home.'/.local/share' if ! exists $ENV{XDG_DATA_HOME}; | |
23 | mkpath $ENV{XDG_DATA_HOME}; | |
24 | ||
25 | $ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME}.'/gcfilms'; | |
26 | -$ENV{GCF_CONFIG_HOME} = $ENV{XDG_CONFIG_HOME} if ($^O =~ /win32/i); | |
27 | mkdir $ENV{GCF_CONFIG_HOME}; | |
28 | $ENV{GCF_CONFIG_FILE} = $ENV{GCF_CONFIG_HOME}.'/gcfilms.conf'; | |
29 | $ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME}.'/gcfilms'; | |
30 | -$ENV{GCF_DATA_HOME} = $ENV{XDG_DATA_HOME} if ($^O =~ /win32/i); | |
31 | mkdir $ENV{GCF_DATA_HOME}; | |
32 | ||
33 | -$ENV{GCF_BIN_DIR} = $RealBin; | |
34 | -($ENV{GCF_LIB_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/lib\/gcfilms/; | |
35 | - | |
36 | -($ENV{GCF_SHARE_DIR} = $ENV{GCF_BIN_DIR}) =~ s/bin\/?$/share\/gcfilms/; | |
37 | +$ENV{GCF_BIN_DIR} = '/usr/bin'; | |
38 | +$ENV{GCF_LIB_DIR} = '/usr/share/gcfilms/lib'; | |
39 | +$ENV{GCF_SHARE_DIR} = '/usr/share/gcfilms'; | |
40 | ||
41 | my $options = new GCOptionLoader($ENV{GCF_CONFIG_FILE}); | |
42 | ||
43 | --- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:44:54.000000000 +0300 | |
44 | +++ GCStyle.pm 2005-08-08 01:48:39.766115248 +0300 | |
45 | @@ -28,19 +28,15 @@ | |
46 | use base 'Exporter'; | |
47 | our @EXPORT = qw(%styles); | |
48 | ||
49 | - use FindBin qw($RealBin); | |
50 | use File::Basename; | |
51 | our %styles; | |
52 | ||
53 | - use Cwd; | |
54 | - my $oldCwd = getcwd; | |
55 | - chdir $RealBin; | |
56 | foreach (glob "../share/gcfilms/style/*") | |
57 | { | |
58 | my $style = basename($_); | |
59 | next if $style eq 'CVS'; | |
60 | my %tmpStyle; | |
61 | - $tmpStyle{dir} = $RealBin.'/'.$_; | |
62 | + $tmpStyle{dir} = $_; | |
63 | $tmpStyle{rcFile} = $tmpStyle{dir}.'/gtkrc'; | |
64 | $tmpStyle{name} = $style; | |
65 | $styles{$style} = \%tmpStyle; | |
66 | @@ -49,8 +45,6 @@ | |
67 | # $tmpStyle{dir} = ''; | |
68 | # $tmpStyle{name} = 'Gtk'; | |
69 | # $styles{Gtk} = \%tmpStyle; | |
70 | - | |
71 | - chdir $oldCwd; | |
72 | } | |
73 | ||
74 | 1; | |
75 | --- ./lib/gcfilms/GCOptions.pm 2005-07-14 16:39:08.000000000 +0200 | |
76 | +++ ../../lib/gcfilms/GCOptions.pm 2005-08-08 00:56:04.000000000 +0200 | |
77 | @@ -65,7 +65,7 @@ | |
78 | open OPTIONS, ">$file" or $self->{parent}->optionsError('create'); | |
79 | printf OPTIONS 'images='.$ENV{GCF_DATA_HOME}.'/images/ | |
80 | autosave=1 | |
81 | -browser=firefox | |
82 | +browser=mozilla-firefox | |
83 | file='.$ENV{GCF_DATA_HOME}.'/films.gcf | |
84 | order==0 | |
85 | split=300 | |
86 | --- gcfilms/lib/gcfilms/GCStyle.pm 2005-08-08 01:59:05.000000000 +0300 | |
87 | +++ GCStyle.pm 2005-08-08 02:01:04.210942432 +0300 | |
88 | @@ -31,7 +31,7 @@ | |
89 | use File::Basename; | |
90 | our %styles; | |
91 | ||
92 | - foreach (glob "../share/gcfilms/style/*") | |
93 | + foreach (glob "/usr/share/gcfilms/*") | |
94 | { | |
95 | my $style = basename($_); | |
96 | next if $style eq 'CVS'; | |
97 | diff -Nur bla/lib/gcfilms/GCExport.pm ../BUILD/gcfilms/lib/gcfilms/GCExport.pm | |
98 | --- bla/lib/gcfilms/GCExport.pm 2005-04-07 19:18:45.000000000 +0200 | |
99 | +++ ../BUILD/gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 01:04:54.000000000 +0200 | |
100 | @@ -35,7 +35,7 @@ | |
101 | use Cwd; | |
102 | my $oldCwd = getcwd; | |
103 | chdir $RealBin; | |
104 | -foreach (glob "../lib/gcfilms/GCExport/*.pm") | |
105 | +foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm") | |
106 | { | |
107 | my $export = basename($_, '.pm')."\n"; | |
108 | next if $export =~ /GCExportBase/; | |
109 | diff -Nur bla/lib/gcfilms/GCImport.pm ../BUILD/gcfilms/lib/gcfilms/GCImport.pm | |
110 | --- bla/lib/gcfilms/GCImport.pm 2005-04-10 14:24:33.000000000 +0200 | |
111 | +++ ../BUILD/gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 01:04:54.000000000 +0200 | |
112 | @@ -33,7 +33,7 @@ | |
113 | use Cwd; | |
114 | my $oldCwd = getcwd; | |
115 | chdir $RealBin; | |
116 | -foreach (glob "../lib/gcfilms/GCImport/*.pm") | |
117 | +foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm") | |
118 | { | |
119 | my $import = basename($_, '.pm')."\n"; | |
120 | next if $import =~ /GCImportBase/; | |
121 | diff -Nur bla/lib/gcfilms/GCLang.pm ../BUILD/gcfilms/lib/gcfilms/GCLang.pm | |
122 | --- bla/lib/gcfilms/GCLang.pm 2005-06-11 14:18:36.000000000 +0200 | |
123 | +++ ../BUILD/gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 01:04:54.000000000 +0200 | |
124 | @@ -40,8 +40,8 @@ | |
125 | use Cwd; | |
126 | my $oldCwd = getcwd; | |
127 | chdir $baseDir; | |
128 | - use lib '../lib/gcfilms/'; | |
129 | - foreach (glob "../lib/gcfilms/GCLang/*.pm") | |
130 | + use lib '/usr/share/gcfilms/lib/'; | |
131 | + foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm") | |
132 | { | |
133 | my $lang = basename($_, '.pm'); | |
134 | eval "use GCLang::$lang"; | |
135 | diff -Nur bla/lib/gcfilms/GCPlugins.pm ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm | |
136 | --- bla/lib/gcfilms/GCPlugins.pm 2005-06-30 22:51:37.000000000 +0200 | |
137 | +++ ../BUILD/gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 01:04:54.000000000 +0200 | |
138 | @@ -37,7 +37,7 @@ | |
139 | my $oldCwd = getcwd; | |
140 | chdir $RealBin; | |
141 | ||
142 | - foreach (glob "../lib/gcfilms/GCPlugins/*.pm") | |
143 | + foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm") | |
144 | { | |
145 | my $plugin = basename($_, '.pm')."\n"; | |
146 | next if $plugin =~ /GCPluginsBase/; | |
fa44ee9a ER |
147 | diff -Nur ../gcfilms/lib/gcfilms/GCExport.pm ./lib/gcfilms/GCExport.pm |
148 | --- ../gcfilms/lib/gcfilms/GCExport.pm 2005-08-08 11:25:21.000000000 +0200 | |
149 | +++ ./lib/gcfilms/GCExport.pm 2005-08-08 01:14:15.000000000 +0200 | |
150 | @@ -25,16 +25,12 @@ | |
151 | use strict; | |
152 | ||
153 | use File::Basename; | |
154 | -use FindBin qw($RealBin); | |
155 | ||
156 | use base 'Exporter'; | |
157 | our @EXPORT = qw(@exportersArray); | |
158 | ||
159 | our @exportersArray; | |
160 | ||
161 | -use Cwd; | |
162 | -my $oldCwd = getcwd; | |
163 | -chdir $RealBin; | |
164 | foreach (glob "/usr/share/gcfilms/lib/GCExport/*.pm") | |
165 | { | |
166 | my $export = basename($_, '.pm')."\n"; | |
167 | @@ -46,7 +42,6 @@ | |
168 | die "Fatal error with exporter $export\n$@" if $@; | |
169 | push @exportersArray, $obj if ! $obj->{errors}; | |
170 | } | |
171 | -chdir $oldCwd; | |
172 | ||
173 | use Gtk2; | |
174 | use GCDialogs; | |
175 | diff -Nur ../gcfilms/lib/gcfilms/GCImport.pm ./lib/gcfilms/GCImport.pm | |
176 | --- ../gcfilms/lib/gcfilms/GCImport.pm 2005-08-08 11:25:21.000000000 +0200 | |
177 | +++ ./lib/gcfilms/GCImport.pm 2005-08-08 01:14:24.000000000 +0200 | |
178 | @@ -23,16 +23,12 @@ | |
179 | ################################################### | |
180 | ||
181 | use File::Basename; | |
182 | -use FindBin qw($RealBin); | |
183 | ||
184 | use base 'Exporter'; | |
185 | our @EXPORT = qw(@importersArray); | |
186 | ||
187 | our @importersArray; | |
188 | ||
189 | -use Cwd; | |
190 | -my $oldCwd = getcwd; | |
191 | -chdir $RealBin; | |
192 | foreach (glob "/usr/share/gcfilms/lib/GCImport/*.pm") | |
193 | { | |
194 | my $import = basename($_, '.pm')."\n"; | |
195 | @@ -44,7 +40,6 @@ | |
196 | die "Fatal error with importer $import\n$@" if $@; | |
197 | push @importersArray, $obj if ! $obj->{errors}; | |
198 | } | |
199 | -chdir $oldCwd; | |
200 | ||
201 | use Gtk2; | |
202 | use GCDialogs; | |
203 | diff -Nur ../gcfilms/lib/gcfilms/GCLang.pm ./lib/gcfilms/GCLang.pm | |
204 | --- ../gcfilms/lib/gcfilms/GCLang.pm 2005-08-08 11:25:21.000000000 +0200 | |
205 | +++ ./lib/gcfilms/GCLang.pm 2005-08-08 11:23:49.000000000 +0200 | |
206 | @@ -29,18 +29,9 @@ | |
207 | our @EXPORT = qw(%langs @langsNames); | |
208 | ||
209 | use File::Basename; | |
210 | - use FindBin qw($RealBin $Script); | |
211 | - | |
212 | - my $baseDir = $RealBin; | |
213 | - $baseDir .= '/bin' if $Script =~ m/install$/; | |
214 | - $baseDir = '..' if $Script eq '-e'; | |
215 | - | |
216 | our %langs; | |
217 | ||
218 | - use Cwd; | |
219 | - my $oldCwd = getcwd; | |
220 | - chdir $baseDir; | |
221 | - use lib '/usr/share/gcfilms/lib/'; | |
222 | + use lib '/usr/share/gcfilms/lib'; | |
223 | foreach (glob "/usr/share/gcfilms/lib/GCLang/*.pm") | |
224 | { | |
225 | my $lang = basename($_, '.pm'); | |
226 | @@ -49,7 +40,6 @@ | |
227 | eval "%tmpLang = %GCLang::${lang}::lang"; | |
228 | $langs{$lang} = \%tmpLang; | |
229 | } | |
230 | - chdir $oldCwd; | |
231 | our @langsNames; | |
232 | foreach (keys %langs) | |
233 | { | |
234 | diff -Nur ../gcfilms/lib/gcfilms/GCPlugins.pm ./lib/gcfilms/GCPlugins.pm | |
235 | --- ../gcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 11:25:21.000000000 +0200 | |
236 | +++ ./lib/gcfilms/GCPlugins.pm 2005-08-08 11:24:49.000000000 +0200 | |
237 | @@ -26,17 +26,12 @@ | |
238 | use strict; | |
239 | ||
240 | use File::Basename; | |
241 | - use FindBin qw($RealBin); | |
242 | ||
243 | use base 'Exporter'; | |
244 | our @EXPORT = qw(%pluginsMap @pluginsNameArray); | |
245 | ||
246 | our %pluginsMap; | |
247 | ||
248 | - use Cwd; | |
249 | - my $oldCwd = getcwd; | |
250 | - chdir $RealBin; | |
251 | - | |
252 | foreach (glob "/usr/share/gcfilms/lib/GCPlugins/*.pm") | |
253 | { | |
254 | my $plugin = basename($_, '.pm')."\n"; | |
255 | --- fcfilms/lib/gcfilms/GCPlugins.pm 2005-08-08 12:26:47.000000000 +0300 | |
256 | +++ GCPlugins.pm 2005-08-08 12:30:04.062612904 +0300 | |
257 | @@ -44,7 +44,6 @@ | |
258 | #push @pluginsArray, $obj; | |
259 | $pluginsMap{$obj->getName} = $obj; | |
260 | } | |
261 | - chdir $oldCwd; | |
262 | ||
263 | our @pluginsNameArray = sort keys %pluginsMap; | |
264 | ||
265 | --- gcfilms/lib/gcfilms/GCMainWindow.pm 2005-07-20 20:46:17.000000000 +0300 | |
266 | +++ GCMainWindow.pm 2005-08-08 12:34:15.674362104 +0300 | |
267 | @@ -125,11 +125,6 @@ | |
268 | package GCFrame; | |
269 | use base "Gtk2::Window"; | |
270 | ||
271 | - if ($^O =~ /win32/i) | |
272 | - { | |
273 | - use File::DosGlob 'glob'; | |
274 | - } | |
275 | - | |
276 | use GCMoviesLists; | |
277 | use GCPlugins; | |
278 | use GCGraphicComponents; | |
279 | --- gcfilms/lib/gcfilms/GCExport/GCExportBase.pm 2005-07-22 16:29:09.000000000 +0300 | |
280 | +++ GCExport/GCExportBase.pm 2005-08-08 12:35:51.802748368 +0300 | |
281 | @@ -29,11 +29,6 @@ | |
282 | use File::Basename; | |
283 | use File::Copy; | |
284 | ||
285 | - if ($^O =~ /win32/i) | |
286 | - { | |
287 | - use File::DosGlob 'glob'; | |
288 | - } | |
289 | - | |
290 | #Methods to be overriden in specific classes | |
291 | ||
292 | sub new |