geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix windows build break due to directory and path changes --continue

Browse Source
This commit is contained in:
soochoi
2006-06-15 16:31:51 +00:00
parent 5b995c9b44
commit 723bf2b277
15 changed files with 43 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CASA/Makefile.am
View File

@@ -60,7 +60,7 @@ installcheck-summary:
clean-local: clean-local:
rm -rf *.suo $(CASALIBDIR) rm -rf *.suo $(CASALIBDIR)
rm -rf *.suo $(CASABINDIR) rm -rf *.suo $(CASABINDIR)
rm -rf BUILT
maintainer-clean-local: maintainer-clean-local:
rm -f configure Makefile.in casa-*.tar.gz rm -f configure Makefile.in casa-*.tar.gz
rm -f aclocal.m4 conf*.sh configure.lineno rm -f aclocal.m4 conf*.sh configure.lineno

26
CASA/adlib/Novell.CASA.A-D.csproj
View File

@@ -94,41 +94,35 @@
Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}" Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
/> />
<Reference
Name = "pango-sharp"
AssemblyName = "pango-sharp"
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
/>
<Reference <Reference
Name = "atk-sharp" Name = "atk-sharp"
AssemblyName = "atk-sharp" AssemblyName = "atk-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/> />
<Reference <Reference
Name = "gdk-sharp" Name = "gdk-sharp"
AssemblyName = "gdk-sharp" AssemblyName = "gdk-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/> />
<Reference <Reference
Name = "glade-sharp" Name = "glade-sharp"
AssemblyName = "glade-sharp" AssemblyName = "glade-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/> />
<Reference <Reference
Name = "glib-sharp" Name = "glib-sharp"
AssemblyName = "glib-sharp" AssemblyName = "glib-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/> />
<Reference <Reference
Name = "gtk-sharp" Name = "gtk-sharp"
AssemblyName = "gtk-sharp" AssemblyName = "gtk-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/>
<Reference
Name = "pango-sharp"
AssemblyName = "pango-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/> />
</References> </References>
</Build> </Build>

2
CASA/adlib/Novell.CASA.A-D.csproj.user
View File

@@ -1,7 +1,7 @@
<VisualStudioProject> <VisualStudioProject>
<CSHARP LastOpenVersion = "7.10.3077" > <CSHARP LastOpenVersion = "7.10.3077" >
<Build> <Build>
<Settings ReferencePath = "" > <Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp-2.0\" >
<Config <Config
Name = "Debug" Name = "Debug"
EnableASPDebugging = "false" EnableASPDebugging = "false"

2
CASA/common/windows/Makefile.am
View File

@@ -83,7 +83,7 @@ $(OBJDIR)/%.o: %.cpp
$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT):
@echo [======== Creating symlink $@ ========] @echo [======== Creating symlink $@ ========]
ln -f $(CFILES) $(CASAROOT)/c_micasadk ln -f $(CFILES) $(CASAROOT)/micasadk
$(OBJDIR): $(OBJDIR):
[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)

42
CASA/gui/CASAManager.csproj
View File

@@ -109,41 +109,35 @@
Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}" Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
/> />
<Reference
Name = "atk-sharp"
AssemblyName = "atk-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/>
<Reference
Name = "gdk-sharp"
AssemblyName = "gdk-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/>
<Reference
Name = "glade-sharp"
AssemblyName = "glade-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/>
<Reference <Reference
Name = "glib-sharp" Name = "glib-sharp"
AssemblyName = "glib-sharp" AssemblyName = "glib-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/> />
<Reference <Reference
Name = "gtk-sharp" Name = "gtk-sharp"
AssemblyName = "gtk-sharp" AssemblyName = "gtk-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
/> />
<Reference <Reference
Name = "pango-sharp" Name = "pango-sharp"
AssemblyName = "pango-sharp" AssemblyName = "pango-sharp"
HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll" HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0" />
<Reference
Name = "atk-sharp"
AssemblyName = "atk-sharp"
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
/>
<Reference
Name = "gdk-sharp"
AssemblyName = "gdk-sharp"
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
/>
<Reference
Name = "glade-sharp"
AssemblyName = "glade-sharp"
HintPath = "..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
/> />
</References> </References>
</Build> </Build>

2
CASA/gui/CASAManager.csproj.user
View File

@@ -1,7 +1,7 @@
<VisualStudioProject> <VisualStudioProject>
<CSHARP LastOpenVersion = "7.10.3077" > <CSHARP LastOpenVersion = "7.10.3077" >
<Build> <Build>
<Settings ReferencePath = "" > <Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp-2.0\" >
<Config <Config
Name = "Debug" Name = "Debug"
EnableASPDebugging = "false" EnableASPDebugging = "false"

2
CASA/micasacache/windows/Makefile.am
View File

@@ -52,7 +52,7 @@ PLATFORMDEPENDENTSOURCEDIR = .
MODULE_NAME =micasacache MODULE_NAME =micasacache
MODULE_EXT =dll MODULE_EXT =dll
SFILES = $(CASAROOT)/vs_solutions/CASAInstall/CASA.sln SFILES = $(CASAROOT)/package/windows/vs_solutions/CASAInstall/CASA.sln
PROJECT_NAME= micasacache PROJECT_NAME= micasacache

4
CASA/micasad/micasad.csproj
View File

@@ -260,7 +260,7 @@
/> />
<File <File
RelPath = "init\ProjectInstaller.cs" RelPath = "init\ProjectInstaller.cs"
SubType = "Component" SubType = "Code"
BuildAction = "Compile" BuildAction = "Compile"
/> />
<File <File
@@ -270,7 +270,7 @@
/> />
<File <File
RelPath = "init\WinSecretStoreClientService.cs" RelPath = "init\WinSecretStoreClientService.cs"
SubType = "Component" SubType = "Code"
BuildAction = "Compile" BuildAction = "Compile"
/> />
<File <File

2
CASA/micasadk/windows/Makefile.am
View File

@@ -52,7 +52,7 @@ PLATFORMDEPENDENTSOURCEDIR = .
MODULE_NAME =micasa MODULE_NAME =micasa
MODULE_EXT =dll MODULE_EXT =dll
SFILES = $(CASAROOT)/vs_solutions/CASAInstall/CASA.sln SFILES = $(CASAROOT)/package/windows/vs_solutions/CASAInstall/CASA.sln
PROJECT_NAME= micasa PROJECT_NAME= micasa

BIN
CASA/package/windows/vs_solutions/CASAInstall/CASA.ncb
View File

Binary file not shown.

BIN
CASA/package/windows/vs_solutions/CASAInstall/CASA.suo
View File

Binary file not shown.

6
CASA/package/windows/vs_solutions/CASAInstall/CASA.vdproj
View File

@@ -302,13 +302,13 @@
{ {
"Name" = "8:Microsoft Visual Studio" "Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:CASA" "ProductName" = "8:CASA"
"ProductCode" = "8:{E87F8885-C799-4C0A-9761-8514A8A09C46}" "ProductCode" = "8:{E98F34B3-D061-4060-870F-42EA2959E74C}"
"PackageCode" = "8:{8D36149E-F746-4006-A4FA-3E6745D36021}" "PackageCode" = "8:{E98F34B3-D061-4060-870F-42EA2959E74C}"
"UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}" "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
"RestartWWWService" = "11:FALSE" "RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE"
"ProductVersion" = "8:1.6.699" "ProductVersion" = "8:1.7.678"
"Manufacturer" = "8:Novell" "Manufacturer" = "8:Novell"
"ARPHELPTELEPHONE" = "8:" "ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:" "ARPHELPLINK" = "8:"

4
CASA/package/windows/vs_solutions/CASAInstall/Makefile.am
View File

@@ -31,7 +31,7 @@ DIST_SUBDIRS =
EXTRA_DIST = $(SFILES) EXTRA_DIST = $(SFILES)
CASAROOT = ../.. CASAROOT = ../../../..
CASALIBDIR = $(CASAROOT)/lib CASALIBDIR = $(CASAROOT)/lib
@@ -109,7 +109,7 @@ clean-local:
if [ -d Debug ]; then rm -rf Debug; fi if [ -d Debug ]; then rm -rf Debug; fi
if [ -f build.log ]; then rm -f build.log; fi if [ -f build.log ]; then rm -f build.log; fi
if [ -d BUILT ]; then rm -rf BUILT; fi if [ -d BUILT ]; then rm -rf BUILT; fi
if [ -f $(PACKAGE)-$(VERSION).tar.bz2 ]; then rm -f $(PACKAGE)-$(VERSION).tar.bz2; fi
distclean-local: distclean-local:
maintainer-clean-local: maintainer-clean-local:

BIN
CASA/package/windows/vs_solutions/CASAManager/CASAManager.suo
View File

Binary file not shown.

4
CASA/package/windows/vs_solutions/miCASA-msm/miCASA-msm.vdproj
View File

@@ -1934,8 +1934,8 @@
} }
"Module" "Module"
{ {
"ModuleSignature" = "8:MergeModule.71E87B6C0C774E9FBADBFDACFC28E60A" "ModuleSignature" = "8:MergeModule.23882DEA21CB4D9C85AFFC59560C0630"
"Version" = "8:1.5.0.0" "Version" = "8:1.7.678.0"
"Title" = "8:miCASA-msm" "Title" = "8:miCASA-msm"
"Subject" = "8:" "Subject" = "8:"
"Author" = "8:Organization" "Author" = "8:Organization"