From 5436a84b0ac35acae2ff56b8a4ee8bcb1051057a Mon Sep 17 00:00:00 2001 From: soochoi Date: Wed, 18 Oct 2006 22:56:15 +0000 Subject: [PATCH] CASA:make changes in makefile and VersionVDProj tools to build with VS 2005 --- .../vs_solutions/CASAInstall/Makefile.am | 11 +- CASA/readme-folder/readme-win.txt | 12 +- .../w32/VersionVDProj/MSIProjectVersioner.cs | 2 +- CASA/tools/w32/VersionVDProj/README | 3 + .../w32/VersionVDProj/VersionVDProj.csproj | 133 ++++++++++++++++++ .../w32/VersionVDProj/bin/VersionVDProj.exe | Bin 24576 -> 24576 bytes 6 files changed, 148 insertions(+), 13 deletions(-) create mode 100644 CASA/tools/w32/VersionVDProj/VersionVDProj.csproj diff --git a/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am b/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am index 2eaf19ba..037e6e41 100755 --- a/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am +++ b/CASA/package/windows/vs_solutions/CASAInstall/Makefile.am @@ -69,20 +69,19 @@ vpath %.cpp $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR) $(MODULE_NAME).$(MODULE_EXT): $(SFILES) $(OBJDIR) devenv @echo [======== Updating msi and msm numbe ========] "$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msi $(MSIFILE) version=$(VERSION) - "$(TOOLDIR)/w32/VersionVDProj/bin/VersionVDProj.exe" -msm $(MSMFILE) version=$(VERSION) @echo [======== Building Solution $(SFILES) ========] - "$(VSINSTALLDIR)/devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log + "$(VSINSTALLDIR)\devenv" /rebuild $(TARGET_CFG) $(SFILES) /out build.log cp -f $(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT) $(CASABINDIR) - cp -f $(TARGET_CFG)/Setup.* $(CASABINDIR) + cp -f $(TARGET_CFG)/setup.* $(CASABINDIR) [ -d BUILT ] | mkdir -p BUILT - cp -p $(CASABINDIR)/Setup.* BUILT + cp -p $(CASABINDIR)/setup.* BUILT cp -p $(CASABINDIR)/CASA.msi BUILT tar -cvf $(PACKAGE)-$(VERSION).tar ./BUILT bzip2 -z $(PACKAGE)-$(VERSION).tar devenv: - @if ! test -x "$(VSINSTALLDIR)/devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi + @if ! test -x "$(VSINSTALLDIR)\devenv.exe";then echo "Error: MS Studio .NET is currently required to build MSI and MSM";exit 1;fi $(OBJDIR): [ -d $(OBJDIR) ] || mkdir -p $(OBJDIR) @@ -104,7 +103,7 @@ uninstall-local: clean-local: @echo [======== Cleaning Solution $(SFILES) ========] - "$(VSINSTALLDIR)/devenv" /clean $(TARGET_CFG) $(SFILES) + "$(VSINSTALLDIR)\devenv" /clean $(TARGET_CFG) $(SFILES) if [ -d $(TARGET_CFG) ]; then rm -rf $(TARGET_CFG); fi if [ -d Debug ]; then rm -rf Debug; fi if [ -f build.log ]; then rm -f build.log; fi diff --git a/CASA/readme-folder/readme-win.txt b/CASA/readme-folder/readme-win.txt index ec310dc7..df62b3c4 100644 --- a/CASA/readme-folder/readme-win.txt +++ b/CASA/readme-folder/readme-win.txt @@ -1,7 +1,7 @@ ----------------------------------------------------------------- REQUIREMENTS FOR BUILDING THE SOFTWARE PACKAGE ON WINDOWS ----------------------------------------------------------------- - - Install Visual Studio .NET 2003 + - Install Visual Studio 2005 - Install Cygwin - Install JAVA 1.5 - Install GTK 2.6 @@ -90,16 +90,16 @@ Sample cygwin.bat: @echo off set JAVA_HOME=C:/Program Files/Java/jdk1.5.0_07 -set VSINSTALLDIR=C:/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE -set MSC=C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7 +set VSINSTALLDIR=C:/Program Files/Microsoft Visual Studio 2005/Common7/IDE +set MSC=C:/Program Files/Microsoft Visual Studio 2005/VC set PATH=%PATH%:/cygdrive/c/Program Files/Java/jdk1.5.0_07/bin -set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Vc7/bin -set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio .NET 2003/Common7/IDE +set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio 2005/VC/bin +set PATH=%PATH%:/cygdrive/c/Program Files/Microsoft Visual Studio 2005/Common7/IDE set INCLUDE=%INCLUDE%;c:\Program Files\Java\jdk1.5.0_07\include set INCLUDE=%INCLUDE%;c:\Program Files\Java\jdk1.5.0_07\include\win32 -set INCLUDE=%INCLUDE%;c:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\include +set INCLUDE=%INCLUDE%;c:\Program Files\Microsoft Visual Studio 2005\VC\include C: chdir C:\cygwin\bin diff --git a/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs b/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs index 52a0474b..86df039c 100644 --- a/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs +++ b/CASA/tools/w32/VersionVDProj/MSIProjectVersioner.cs @@ -37,7 +37,7 @@ namespace VersionVDProj /// public class MSIProjectVersioner : VDProjectVersioner { - private readonly static Guid MSI_PROJECT_TYPE = new Guid( "{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" ); + private readonly static Guid MSI_PROJECT_TYPE = new Guid( "{978C614F-708E-4E1A-B201-565925725DBA}" ); private Guid productCode = Guid.Empty; private Guid packageCode = Guid.Empty; diff --git a/CASA/tools/w32/VersionVDProj/README b/CASA/tools/w32/VersionVDProj/README index cc37127f..b4c63c7b 100644 --- a/CASA/tools/w32/VersionVDProj/README +++ b/CASA/tools/w32/VersionVDProj/README @@ -13,6 +13,9 @@ The copy right associated with this tool is as followings: // use however you'd like //////////////////////////////////////////////////////////////// + 4/14/2006 +10/18/2006 change MSI_PROJECT_TYPE to work with VS 2006 + diff --git a/CASA/tools/w32/VersionVDProj/VersionVDProj.csproj b/CASA/tools/w32/VersionVDProj/VersionVDProj.csproj new file mode 100644 index 00000000..4f848ea1 --- /dev/null +++ b/CASA/tools/w32/VersionVDProj/VersionVDProj.csproj @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CASA/tools/w32/VersionVDProj/bin/VersionVDProj.exe b/CASA/tools/w32/VersionVDProj/bin/VersionVDProj.exe index b0ca6153c4e085d314f92f840c175d72787e48b6..a5233e575a4ef012c1c36d4105ab6efdf8ce7dc7 100755 GIT binary patch delta 3545 zcmZ`*du$ZP8UJQ>cK2RBy!W(yCcXn~pU?K?Y@c5c5{&H-1SmuVY6Q)rB~V1^I(vzf z#F&FLp`jw7))EQYkfc(A3aX-lk(#OzwOW)aQL8p-t3ni6O<$5Fk|=5a0Es?+Gka&F zK*qY?e((9_n{Q@(V1^x-Vc&aBXfOATP916F7e=SfYzdE#60IYQhls}fQ<YvmW4r=Mo~!|7LHCdWPaas2Mc5fxKJ3^aZQ918BnTEWh^n`^sS*nO^cX#FCh zK&ck+lxa-BO4tFICTeCgA!nFqJZnMcvm-!7CTnKRETS8UoFDNST#0;C{th+7+_;q~ zOMB;1)zewdDlwdM^VIoyY6-7uU!SK|YgO5w=BYMOmHl#_T8Q`0d6})3tA-2eTTS;5 zy=r&Bs8S0a?^k6xiWV4|a*Y@~8^z+JOwgF*i7ZdXOEG9BQNOUzUf5lCd(g?7G+wH8 zS4ZwFcPnoqEs?b2vOHgdE}H<=VL7PRxRzbm1}$kPp|R@#C~&mEX$kx_%%zp;Aq*IH z13sOWvlC%%bTyQ{MzRltv~OCOuv1i)KJgyQIrRm5En%p9f|`*WQ?rJ+>H$;D?z0=c z94J-L$w5#ZLH93~IdJ`BlOn?+H4~ zVCQvOgiN2`w-s~BYGgBj_G(14^Nra+i<%@VX1S5GM9zIT+EO+aimgo|5y2-U+9*z- zv=o54sGLmaNHwEmKIQxfOvQAWoK01_8Prq4$okO8*%mMzDJSH=g`qkb&I5kB?WQ2= zILro&4#Tip-REQNW%P-qIr|XD&LU=K&^ZFyTQjdH+MuwpPk|D4*_gzt1lQ~!XlDk- zDk#r}zz3Ww^8#aJA=?$X`@Q%v2=P@sbNyekzWC*?8dkwcUF66>cCm1t zkjZ7-jdjb)Ux5&j(b;dyXsVQTT;mgHQn66`Ny+B8^MUk~^$$cSyD+J|^3)Sx56UIW z2Jk#^!|AjEbI74N|5h188_%b3W_%&{Uv-OFlWWzd+(Lb-EH4X{FCI2EDi^Sp#ieNA z$ejt{$f@(~UDUX;)o^NSw9pg~ zBGFKBPT>`hwZYl7wB++?Jcc#?L{t8x-(G>}0Ryq}K43$hCvrwqB%*qI)Do8d{h*n> z!_73*wfMO)DKkpue7VY7x`dk7kd8L1bQNZBFE_NVyoB3s>3*USTp4dldedXh?r-fX z$>gsihepI%x_J}T;f;`cxpd9uwIldu!H3+Hsn(2qM&wflLqf4Af!`hY$%znvg6^}a z!wD~Vs1mMwaNZctIt-_@nfiwa+N zA8))?eoH1p2T5mnJXKdJT$B~@#;n3^PBcZ!+5PbPP;t-HouUVk{cE_xi4M_M*)Dk# zsc}*N2Dkv-gI$*~OKh)NkK``u2U#1q-zeQPbd)_xAxf8V=OYY)?xRJtU2zvlhN-3N z6;3)@v<&@@Wa{3-e>xFbr8v(oLfaMR`9*1_!b!gvHR67$`o(ELani3yaeAn&ER~0R z*N|y~4tPpmm`m<0#T}$2{E*rqM(6PMSMjQ%(|Fw(-KFqeh2ua@k1P6jH{cp{3ZwNv zPFsK)ZIhA~T+>qFnR-SyOTO(|O`FOwIzbn-6To-0m+6Nj*KnHts=WsKinbTqa0=_S z6rMmYzX{8LxBw(^5m+boQoZszOGWVxB*Wr;*sl|pC_`Js6ZA9M1sf^D+OmD(S6Bj0PhkHBLJglb~i#%cy=N5);@<==^(u_9(8XLifBabSZ zCj+J)iASD{Ooqb-Y2h%m#KYmRFuBkDRqvpy^&O4U@lkowyzz#l(^HuQe|2>F-M$h3 zIbLAX;Z=9C(BYlu{PH}=@ATNvf0DwzKV@~9v- delta 3838 zcmZ`+3v5)!6}|Jm`}5+r>-GAJ*Vx#L*Iw548h;2WpT*?kG;R#kiLDa8#svJFw|pF& zWo;6rsY0RdLu!jafhq+;qqf9VrBrE4Tbi~~qNYt+g*I~2NJNd)d{9UuDmCqydAl|Q z@>cJ>J9o~#Gjr$89ed&eo4CNf@uc#Ly~|QlhbpA^yQj{r_aE;jx|i@gNYwA1st)=l zhoX&|bwudqh@epWACt(!i`4)`Olg3g~i@Je{!1nWXM5rd3ZgF(XXEmYWZ_PW9r zHqU;ta79lcktb~c_Uqa>Sc>TZwYXrW#%HY}8jS|f=Q4vpA%+WP+);Q3B}VQB274kG zWxq;gAvWS-3W2>rwbI7r|$f*E$5* zS+|tyKuA4i43I`HXc>(!L^iQwnsotW;Z%wu*qX=s*Q~->Y9lvm0(f=JjN?1w(Hk}0 zj6%f0w_~A&{WyxoO_5127Dnj=K0YT*1+gNRP|qD)P{%qDGT26)QoO<#yVuTV3c>Mf{^}Ab53Oj9d-DgiKhA zcqFm+8SILZ6OsOT(L?s##kE-;*~Ur@|v@1i&%2{wTMK*oEO(ke?JMvzE)& z>yG}5;nL1_Zr=g0d|qsKC#NB`wL;c$95HYvA;RETFO#i85aIP?xOB#hjXJ^ zg$4Zh<2)$ErO~Bu^c{`hAK1w zCn$M_9R50LBP(zhSH(}b&D;1$8eGOXmc^A~U#tz4uQ;g2f`($K$Gm!U8Ax@88txBf zRYNr}gOxcQNxeZwPz>AfQx_H7(Y>`iYN*}8jh{Z=bI zY>uo?^;+hRL37iN!PM4Gdxmb*$49qpvOCM_m$^{pY7P+X#`jHB?V7&b*6_$s8Y56I za;5@Hs9D!XJ8=Q>O|4n8?oK|>N6}8%C(7!pu^4eBgGiV!k0c=~Vuf%(rS|2ruMIsf zKP_wYlDv>Kni2SkK&Eg_k8%n4n833FUljPN=zUvYjmkL*f%m8@RE-9Nd|u@qUKIGU z{fF{vofnX5M3bblI4N{B*9x*EsdNXQE=^GvTMMgyiq_*Lr)dM$@FSa5mb0~XWo3Ex z4ctgXkJAzMFz(j`(vs*2@E)akv{SS$(snk4nD}r>5nZH7wulVsi1OA{$se)b0a`0s zj$Huh=rFlmkY3NVxLpw?ad7i?A?oF|)EO{|(>><2T-Vqxg!g!^<(GKtEzz2!1=15D z^o%aaJopY)DO_G7aGSur0>1^6=(v#oeI1S<1sJ7OoGXd=T`to>q2dON9I8XQS#!>Q zXntSzD1C=cV@0RvvivmgL-`qc7MdiTC%1AAa!}cYKb|{}ZUNYR=EXY+4B-sHdrfy+FSP>5_0% zjREGff6)61ANW%x!3@&XHs+>6l@C^`2HCs9>IyAYlXMMo5ixd}QtS$*o}??ZT`hv1 z^ZCLyuv7Gux(x$=Q{4&V`s^t>Cc2+eA4d0g)iL06>SMs4sE3%rE~+;3BX2q>LTNgN z8+Iw3N2Uhp`@nL6tpdFQR|&jZV4uJN`Yo87DImq^A?lKTNI#_t`WYhf8~Xi1nxS{7 z3bS;xF{)#YtcxvYcd_;C0d|0Wn?1wMu!CfGL~50fU1zr24@Rn|vyoGB*(2%QTX)4% z!yAW2%=GTz&1n*KV`$^1>0oV*G~HRZ-@B%TR#6MBpl(V~3QK6hyAoU54k-!kYE19CfbOYm#A|I>V8O$r{`;j0b&HuN_M-`&D%68^jK(O2v(tw&WgA~DJSq;-CBoy#w2 zE?Eos@D}1-C+p0Ge!t75k|g>4N`(1cQ2ONvNt!MN3hZREaqU($!dPHf2gkspq9f#o zeF%K10#H!_oj4uL@V-$ l2e%z^^YqZFfm^8U*HZ1bAeXOx&m(=fWZLNcVBS