Skip to content

Commit 8efd46c

Browse files
obfuscatedobfuscated
committed
- build: Make sure no manifest.xml file is left after building the smart ident plugins (thanks Miguel Gimenez)
git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12320 2a5c6006-c6dd-42ca-98ab-0921f2732cef
1 parent 608a0cc commit 8efd46c

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎src/plugins/contrib/SmartIndent/Makefile.am‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,35 +104,35 @@ CLEANFILES = $(pkgdata_DATA)
104104
SmartIndentHDL.zip: manifest_hdl.xml
105105
PWD=`pwd` cd $(srcdir) && \
106106
cp manifest_hdl.xml ./manifest.xml && \
107-
zip -R $(PWD)/SmartIndentHDL.zip manifest.xml
107+
zip -Rm $(PWD)/SmartIndentHDL.zip manifest.xml
108108

109109
SmartIndentPascal.zip: manifest_pascal.xml
110110
PWD=`pwd` cd $(srcdir) && \
111111
cp manifest_pascal.xml ./manifest.xml && \
112-
zip -R $(PWD)/SmartIndentPascal.zip manifest.xml
112+
zip -Rm $(PWD)/SmartIndentPascal.zip manifest.xml
113113

114114
SmartIndentCpp.zip: manifest_cpp.xml
115115
PWD=`pwd` cd $(srcdir) && \
116116
cp manifest_cpp.xml ./manifest.xml && \
117-
zip -R $(PWD)/SmartIndentCpp.zip manifest.xml
117+
zip -Rm $(PWD)/SmartIndentCpp.zip manifest.xml
118118

119119
SmartIndentPython.zip: manifest_python.xml
120120
PWD=`pwd` cd $(srcdir) && \
121121
cp manifest_python.xml ./manifest.xml && \
122-
zip -R $(PWD)/SmartIndentPython.zip manifest.xml
122+
zip -Rm $(PWD)/SmartIndentPython.zip manifest.xml
123123

124124
SmartIndentLua.zip: manifest_lua.xml
125125
PWD=`pwd` cd $(srcdir) && \
126126
cp manifest_lua.xml ./manifest.xml && \
127-
zip -R $(PWD)/SmartIndentLua.zip manifest.xml
127+
zip -Rm $(PWD)/SmartIndentLua.zip manifest.xml
128128

129129
SmartIndentFortran.zip: manifest_fortran.xml
130130
PWD=`pwd` cd $(srcdir) && \
131131
cp manifest_fortran.xml ./manifest.xml && \
132-
zip -R $(PWD)/SmartIndentFortran.zip manifest.xml
132+
zip -Rm $(PWD)/SmartIndentFortran.zip manifest.xml
133133

134134
SmartIndentXML.zip: manifest_xml.xml
135135
PWD=`pwd` cd $(srcdir) && \
136136
cp manifest_xml.xml ./manifest.xml && \
137-
zip -R $(PWD)/SmartIndentXML.zip manifest.xml
137+
zip -Rm $(PWD)/SmartIndentXML.zip manifest.xml
138138

‎src/plugins/contrib/SmartIndent/SmartIndent_wx30-unix.cbp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</Compiler>
2323
<ExtraCommands>
2424
<Add after="cp manifest_hdl.xml ./manifest.xml" />
25-
<Add after="zip -j9 ../../../devel30/share/codeblocks/SmartIndentHDL.zip manifest.xml" />
25+
<Add after="zip -jm9 ../../../devel30/share/codeblocks/SmartIndentHDL.zip manifest.xml" />
2626
<Mode after="always" />
2727
</ExtraCommands>
2828
</Target>
@@ -42,7 +42,7 @@
4242
</Compiler>
4343
<ExtraCommands>
4444
<Add after="cp manifest_pascal.xml ./manifest.xml" />
45-
<Add after="zip -j9 ../../../devel30/share/codeblocks/SmartIndentPascal.zip manifest.xml" />
45+
<Add after="zip -jm9 ../../../devel30/share/codeblocks/SmartIndentPascal.zip manifest.xml" />
4646
<Mode after="always" />
4747
</ExtraCommands>
4848
</Target>
@@ -62,7 +62,7 @@
6262
</Compiler>
6363
<ExtraCommands>
6464
<Add after="cp manifest_cpp.xml ./manifest.xml" />
65-
<Add after="zip -j9 ../../../devel30/share/codeblocks/SmartIndentCpp.zip manifest.xml" />
65+
<Add after="zip -jm9 ../../../devel30/share/codeblocks/SmartIndentCpp.zip manifest.xml" />
6666
<Mode after="always" />
6767
</ExtraCommands>
6868
</Target>
@@ -82,7 +82,7 @@
8282
</Compiler>
8383
<ExtraCommands>
8484
<Add after="cp manifest_python.xml ./manifest.xml" />
85-
<Add after="zip -j9 ../../../devel30/share/codeblocks/SmartIndentPython.zip manifest.xml" />
85+
<Add after="zip -jm9 ../../../devel30/share/codeblocks/SmartIndentPython.zip manifest.xml" />
8686
<Mode after="always" />
8787
</ExtraCommands>
8888
</Target>
@@ -102,7 +102,7 @@
102102
</Compiler>
103103
<ExtraCommands>
104104
<Add after="cp manifest_lua.xml ./manifest.xml" />
105-
<Add after="zip -j9 ../../../devel30/share/codeblocks/SmartIndentLua.zip manifest.xml" />
105+
<Add after="zip -jm9 ../../../devel30/share/codeblocks/SmartIndentLua.zip manifest.xml" />
106106
<Mode after="always" />
107107
</ExtraCommands>
108108
</Target>
@@ -122,7 +122,7 @@
122122
</Compiler>
123123
<ExtraCommands>
124124
<Add after="cp manifest_fortran.xml ./manifest.xml" />
125-
<Add after="zip -j9 ../../../devel30/share/codeblocks/SmartIndentFortran.zip manifest.xml" />
125+
<Add after="zip -jm9 ../../../devel30/share/codeblocks/SmartIndentFortran.zip manifest.xml" />
126126
<Mode after="always" />
127127
</ExtraCommands>
128128
</Target>
@@ -142,7 +142,7 @@
142142
</Compiler>
143143
<ExtraCommands>
144144
<Add after="cp manifest_xml.xml ./manifest.xml" />
145-
<Add after="zip -j9 ../../../devel30/share/codeblocks/SmartIndentXML.zip manifest.xml" />
145+
<Add after="zip -jm9 ../../../devel30/share/codeblocks/SmartIndentXML.zip manifest.xml" />
146146
<Mode after="always" />
147147
</ExtraCommands>
148148
</Target>

‎src/plugins/contrib/SmartIndent/SmartIndent_wx31.cbp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</Compiler>
2424
<ExtraCommands>
2525
<Add after="cmd.exe /c copy /Y manifest_cpp.xml manifest.xml" />
26-
<Add after="zip -j9 ..\..\..\devel31\share\CodeBlocks\SmartIndentCpp.zip manifest.xml" />
26+
<Add after="zip -jm9 ..\..\..\devel31\share\CodeBlocks\SmartIndentCpp.zip manifest.xml" />
2727
<Mode after="always" />
2828
</ExtraCommands>
2929
</Target>
@@ -44,7 +44,7 @@
4444
</Compiler>
4545
<ExtraCommands>
4646
<Add after="cmd.exe /c copy /Y manifest_hdl.xml manifest.xml" />
47-
<Add after="zip -j9 ..\..\..\devel31\share\CodeBlocks\SmartIndentHDL.zip manifest.xml" />
47+
<Add after="zip -jm9 ..\..\..\devel31\share\CodeBlocks\SmartIndentHDL.zip manifest.xml" />
4848
<Mode after="always" />
4949
</ExtraCommands>
5050
</Target>
@@ -65,7 +65,7 @@
6565
</Compiler>
6666
<ExtraCommands>
6767
<Add after="cmd.exe /c copy /Y manifest_pascal.xml manifest.xml" />
68-
<Add after="zip -j9 ..\..\..\devel31\share\CodeBlocks\SmartIndentPascal.zip manifest.xml" />
68+
<Add after="zip -jm9 ..\..\..\devel31\share\CodeBlocks\SmartIndentPascal.zip manifest.xml" />
6969
<Mode after="always" />
7070
</ExtraCommands>
7171
</Target>
@@ -86,7 +86,7 @@
8686
</Compiler>
8787
<ExtraCommands>
8888
<Add after="cmd.exe /c copy /Y manifest_python.xml manifest.xml" />
89-
<Add after="zip -j9 ..\..\..\devel31\share\CodeBlocks\SmartIndentPython.zip manifest.xml" />
89+
<Add after="zip -jm9 ..\..\..\devel31\share\CodeBlocks\SmartIndentPython.zip manifest.xml" />
9090
<Mode after="always" />
9191
</ExtraCommands>
9292
</Target>
@@ -107,7 +107,7 @@
107107
</Compiler>
108108
<ExtraCommands>
109109
<Add after="cmd.exe /c copy /Y manifest_lua.xml manifest.xml" />
110-
<Add after="zip -j9 ..\..\..\devel31\share\CodeBlocks\SmartIndentLua.zip manifest.xml" />
110+
<Add after="zip -jm9 ..\..\..\devel31\share\CodeBlocks\SmartIndentLua.zip manifest.xml" />
111111
<Mode after="always" />
112112
</ExtraCommands>
113113
</Target>
@@ -128,7 +128,7 @@
128128
</Compiler>
129129
<ExtraCommands>
130130
<Add after="cmd.exe /c copy /Y manifest_fortran.xml manifest.xml" />
131-
<Add after="zip -j9 ..\..\..\devel31\share\CodeBlocks\SmartIndentFortran.zip manifest.xml" />
131+
<Add after="zip -jm9 ..\..\..\devel31\share\CodeBlocks\SmartIndentFortran.zip manifest.xml" />
132132
<Mode after="always" />
133133
</ExtraCommands>
134134
</Target>
@@ -149,7 +149,7 @@
149149
</Compiler>
150150
<ExtraCommands>
151151
<Add after="cmd.exe /c copy /Y manifest_xml.xml manifest.xml" />
152-
<Add after="zip -j9 ..\..\..\devel31\share\CodeBlocks\SmartIndentXML.zip manifest.xml" />
152+
<Add after="zip -jm9 ..\..\..\devel31\share\CodeBlocks\SmartIndentXML.zip manifest.xml" />
153153
<Mode after="always" />
154154
</ExtraCommands>
155155
</Target>

‎src/plugins/contrib/SmartIndent/SmartIndent_wx31_64.cbp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</Compiler>
2424
<ExtraCommands>
2525
<Add after="cmd.exe /c copy /Y manifest_cpp.xml manifest.xml" />
26-
<Add after="zip -j9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentCpp.zip manifest.xml" />
26+
<Add after="zip -jm9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentCpp.zip manifest.xml" />
2727
<Mode after="always" />
2828
</ExtraCommands>
2929
</Target>
@@ -44,7 +44,7 @@
4444
</Compiler>
4545
<ExtraCommands>
4646
<Add after="cmd.exe /c copy /Y manifest_hdl.xml manifest.xml" />
47-
<Add after="zip -j9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentHDL.zip manifest.xml" />
47+
<Add after="zip -jm9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentHDL.zip manifest.xml" />
4848
<Mode after="always" />
4949
</ExtraCommands>
5050
</Target>
@@ -65,7 +65,7 @@
6565
</Compiler>
6666
<ExtraCommands>
6767
<Add after="cmd.exe /c copy /Y manifest_pascal.xml manifest.xml" />
68-
<Add after="zip -j9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentPascal.zip manifest.xml" />
68+
<Add after="zip -jm9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentPascal.zip manifest.xml" />
6969
<Mode after="always" />
7070
</ExtraCommands>
7171
</Target>
@@ -86,7 +86,7 @@
8686
</Compiler>
8787
<ExtraCommands>
8888
<Add after="cmd.exe /c copy /Y manifest_python.xml manifest.xml" />
89-
<Add after="zip -j9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentPython.zip manifest.xml" />
89+
<Add after="zip -jm9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentPython.zip manifest.xml" />
9090
<Mode after="always" />
9191
</ExtraCommands>
9292
</Target>
@@ -107,7 +107,7 @@
107107
</Compiler>
108108
<ExtraCommands>
109109
<Add after="cmd.exe /c copy /Y manifest_lua.xml manifest.xml" />
110-
<Add after="zip -j9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentLua.zip manifest.xml" />
110+
<Add after="zip -jm9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentLua.zip manifest.xml" />
111111
<Mode after="always" />
112112
</ExtraCommands>
113113
</Target>
@@ -128,7 +128,7 @@
128128
</Compiler>
129129
<ExtraCommands>
130130
<Add after="cmd.exe /c copy /Y manifest_fortran.xml manifest.xml" />
131-
<Add after="zip -j9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentFortran.zip manifest.xml" />
131+
<Add after="zip -jm9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentFortran.zip manifest.xml" />
132132
<Mode after="always" />
133133
</ExtraCommands>
134134
</Target>
@@ -149,7 +149,7 @@
149149
</Compiler>
150150
<ExtraCommands>
151151
<Add after="cmd.exe /c copy /Y manifest_xml.xml manifest.xml" />
152-
<Add after="zip -j9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentXML.zip manifest.xml" />
152+
<Add after="zip -jm9 ..\..\..\devel31_64\share\CodeBlocks\SmartIndentXML.zip manifest.xml" />
153153
<Mode after="always" />
154154
</ExtraCommands>
155155
</Target>

0 commit comments

Comments
 (0)